refactoring.

diff --git a/roles/concourse.rb b/roles/concourse.rb
index 1525849..8e7205a 100644 (file)
--- a/roles/concourse.rb
+++ b/roles/concourse.rb
@@ -4,7 +4,7 @@ description 'Concourse'
 run_list(
   #'recipe[ssl_cert::server_key_pairs]',  # for https
   'role[docker]',
-  'recipe[concourse-ci::docker-compose]',
+  #'recipe[concourse-ci::fly]',
 )
 
 #env_run_lists()
@@ -24,12 +24,12 @@ override_attributes(
   },
   'docker-grid' => {
     'engine' => {
-      #'skip_setup' => true,  # default: false
+      'skip_setup' => false,
       'storage-driver_on_centos' => 'overlay',
       'storage-driver_on_ubuntu' => 'aufs',  # default: aufs
     },
     'compose' => {
-      #'skip_setup' => true,  # default: false
+      'skip_setup' => false,
     },
   },
   'concourse-ci' => {

diff --git a/roles/docker-registry.rb b/roles/docker-registry.rb
index f720527..fb900e1 100644 (file)
--- a/roles/docker-registry.rb
+++ b/roles/docker-registry.rb
@@ -25,10 +25,10 @@ override_attributes(
   },
   'docker-grid' => {
     'engine' => {
-      #'skip_setup' => true,  # default: false
+      'skip_setup' => false,
     },
     'compose' => {
-      #'skip_setup' => true,  # default: false
+      'skip_setup' => false,
     },
     'registry' => {
       'with_ssl_cert_cookbook' => true,

diff --git a/roles/docker-secure.rb b/roles/docker-secure.rb
index f491892..14bf2be 100644 (file)
--- a/roles/docker-secure.rb
+++ b/roles/docker-secure.rb
@@ -2,7 +2,7 @@ name 'docker-secure'
 description 'Secure Docker Engine'
 
 run_list(
-  'recipe[docker-grid::engine]',
+  'role[docker]',
 )
 
 #env_run_lists
@@ -13,10 +13,6 @@ default_attributes(
 override_attributes(
   'docker-grid' => {
     'engine' => {
-      'version_on_centos' => '1.11.2-1',
-      'version_on_ubuntu' => '1.11.2-0',
-      'storage-driver_on_centos' => 'overlay',
-      'storage-driver_on_ubuntu' => 'overlay',  # default: aufs
       'userns-remap' => 'default',
       'daemon_extra_options' => [
         '-H fd:// --bip=192.168.128.1/24 --fixed-cidr=192.168.128.0/24',

diff --git a/roles/docker.rb b/roles/docker.rb
index 290616d..5e6f550 100644 (file)
--- a/roles/docker.rb
+++ b/roles/docker.rb
@@ -3,6 +3,7 @@ description 'Docker Engine'
 
 run_list(
   'recipe[docker-grid::engine]',
+  'recipe[docker-grid::compose]',
 )
 
 #env_run_lists
@@ -14,7 +15,11 @@ override_attributes(
   'docker-grid' => {
     'install_flavor' => 'dockerproject',
     #'install_flavor' => 'os-repository',
+    'compose' => {
+      'skip_setup' => true,  # default: false
+    },
     'engine' => {
+      #'skip_setup' => true,  # default: false
       'version_on_centos' => '1.13.0-1',   # docker-engine
       #'version_on_centos' => '1.12.6-1',   # docker-engine
       #'version_on_centos' => '1.12.5-14',  # docker

diff --git a/roles/jenkins.rb b/roles/jenkins.rb
index 5e5bfd8..654e5d2 100644 (file)
--- a/roles/jenkins.rb
+++ b/roles/jenkins.rb
@@ -4,7 +4,6 @@ description 'Jenkins'
 run_list(
   #'recipe[ssl_cert::server_key_pairs]',
   'role[docker]',
-  'recipe[jenkins-grid::docker-compose]',
 )
 
 #env_run_lists()
@@ -21,10 +20,10 @@ override_attributes(
   },
   'docker-grid' => {
     'engine' => {
-      #'skip_setup' => true,  # default: false
+      'skip_setup' => false,
     },
     'compose' => {
-      #'skip_setup' => true,  # default: false
+      'skip_setup' => false,
     },
   },
   'jenkins-grid' => {