refactoring.

diff --git a/roles/docker.rb b/roles/docker.rb
index 43bbc54..2769d39 100644 (file)
--- a/roles/docker.rb
+++ b/roles/docker.rb
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2017, whitestar
+# Copyright 2016-2018, whitestar
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +17,14 @@
 name 'docker'
 description 'Docker Engine'
 
+# if you set `nil` to its attribute, you can deactivate its override.
+docker_ver_on_centos = '17.12.1.ce-1'
+docker_ver_on_ubuntu = '17.12.1~ce-0'
+docker_compose_ver = '1.21.2'
+
+docker_bip        = '192.168.100.1/24'
+docker_fixed_cidr = '192.168.100.0/24'
+
 run_list(
   'role[docker-new-repo]',
 )
@@ -29,15 +37,18 @@ default_attributes(
 override_attributes(
   'docker-grid' => {
     'engine' => {
-      #'version' => '',  # latest
-      #'userns-remap' => 'default',
+      #'version' => '',  # '' (=latest) or exact version
+      'version_on_centos' => docker_ver_on_centos,  # '18.06.0.ce-3', '18.03.1.ce-1', '17.12.1.ce-1'
+      'version_on_ubuntu' => docker_ver_on_ubuntu,  # '18.06.0~ce~3-0', '18.03.1~ce-0', '17.12.1~ce-0' 
+      #'storage-driver_on_centos' => 'overlay',   # defacto: 'devicemapper'
+      #'storage-driver_on_ubuntu' => 'overlay2',  # defacto: 'aufs'
       'daemon_extra_options' => [
         '-H fd://',
-        #'-H fd:// --bip=192.168.100.1/24 --fixed-cidr=192.168.100.0/24',
-        # for docker >= 1.10, docker-engine >= 1.12 (on rhel family)
-        # '-H fd://' option automatically removed by this cookbook.
-        # See https://github.com/docker/docker/issues/22847
-      ].join(' '), 
+        "--bip=#{docker_bip} --fixed-cidr=#{docker_fixed_cidr}",
+      ].join(' '),
+    },
+    'compose' => {
+      'version' => docker_compose_ver,
     },
   },
 )

diff --git a/roles/screwdriver-all-on-docker-override.rb b/roles/screwdriver-all-on-docker-override.rb
index ef68a4c..c84bafd 100644 (file)
--- a/roles/screwdriver-all-on-docker-override.rb
+++ b/roles/screwdriver-all-on-docker-override.rb
@@ -17,14 +17,16 @@
 name 'screwdriver-all-on-docker-override'
 description 'Screwdriver with all components on Docker (customized)'
 
+# if you set `nil` to its attribute, you can deactivate its override.
 docker_skip_setup = false
 docker_ver_on_centos = '17.12.1.ce-1'
 docker_ver_on_ubuntu = '17.12.1~ce-0'
 docker_compose_skip_setup = false
 docker_compose_ver = '1.21.2'
+network_mode_bridge = false
+
 docker_bip        = '192.168.100.1/24'
 docker_fixed_cidr = '192.168.100.0/24'
-network_mode_bridge = false
 api_ver    = 'latest'
 ui_ver     = 'latest'
 store_ver  = 'latest'

diff --git a/roles/screwdriver-on-docker-override.rb b/roles/screwdriver-on-docker-override.rb
index 2815d96..d16fc2d 100644 (file)
--- a/roles/screwdriver-on-docker-override.rb
+++ b/roles/screwdriver-on-docker-override.rb
@@ -17,14 +17,16 @@
 name 'screwdriver-on-docker-override'
 description 'Screwdriver on Docker (customized)'
 
+# if you set `nil` to its attribute, you can deactivate its override.
 docker_skip_setup = false
 docker_ver_on_centos = '17.12.1.ce-1'
 docker_ver_on_ubuntu = '17.12.1~ce-0'
 docker_compose_skip_setup = false
 docker_compose_ver = '1.21.2'
+network_mode_bridge = false
+
 docker_bip        = '192.168.100.1/24'
 docker_fixed_cidr = '192.168.100.0/24'
-network_mode_bridge = false
 api_ver    = 'latest'
 ui_ver     = 'latest'
 store_ver  = 'latest'