a little modified.

diff --git a/roles/concourse.rb b/roles/concourse.rb
index 71fdbe2..1525849 100644 (file)
--- a/roles/concourse.rb
+++ b/roles/concourse.rb
@@ -25,6 +25,8 @@ override_attributes(
   'docker-grid' => {
     'engine' => {
       #'skip_setup' => true,  # default: false
+      'storage-driver_on_centos' => 'overlay',
+      'storage-driver_on_ubuntu' => 'aufs',  # default: aufs
     },
     'compose' => {
       #'skip_setup' => true,  # default: false
@@ -40,10 +42,10 @@ override_attributes(
         # Version 1 docker-compose format
         'concourse-web' => {
           'image' => image,
-          'ports' => [
-            #"#{port}:8080",  # If you sepecify no value, Chef will sets '8080:8080'.
-            #"#{port}:8443",  # for https
-          ],
+          #'ports' => [
+          #  #"#{port}:8080",  # If you sepecify no value, Chef will sets '8080:8080'.
+          #  #"#{port}:8443",  # for https
+          #],
           'environment' => {
             # If you sepecify no value, Chef will sets "http://#{node['ipaddress']}:8080".
             #'CONCOURSE_EXTERNAL_URL' => "http://192.168.1.3:#{port}",  # or "https://192.168.1.3:#{port}"
@@ -52,11 +54,11 @@ override_attributes(
             #'CONCOURSE_TLS_CERT' => '/root/server.crt',
             #'CONCOURSE_TLS_KEY' => '/root/server.key',
           },
-          'volumes' => [
-            # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
-            #"#{server_cert_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.crt:ro",
-            #"#{server_key_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.key:ro",
-          ],
+          #'volumes' => [
+          #  # These volumes will be set by the concourse-ci::docker-compose recipe automatically.
+          #  #"#{server_cert_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.crt:ro",
+          #  #"#{server_key_path(node['concourse-ci']['ssl_cert']['common_name'])}:/root/server.key:ro",
+          #],
         },
         'concourse-worker' => {
           'image' => image,

diff --git a/roles/docker-registry.rb b/roles/docker-registry.rb
index 3e8ea28..f720527 100644 (file)
--- a/roles/docker-registry.rb
+++ b/roles/docker-registry.rb
@@ -30,8 +30,6 @@ override_attributes(
     'compose' => {
       #'skip_setup' => true,  # default: false
     },
-  },
-  'docker-grid' => {
     'registry' => {
       'with_ssl_cert_cookbook' => true,
       'ssl_cert' => {