adds the `skip_setup` attributes for Docker Engine and Compose.

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index ebc8bd4..fae5ef2 100644 (file)
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,10 @@
 # docker-grid CHANGELOG
 
+0.3.5
+-----
+- adds the `['docker-grid']['engine']['skip_setup']` attribute.
+- adds the `['docker-grid']['compose']['skip_setup']` attribute.
+
 0.3.4
 -----
 - improves CentOS distributed `docker` package support.

diff --git a/cookbooks/docker-grid/README.md b/cookbooks/docker-grid/README.md
index 8d24f80..5d89eac 100644 (file)
--- a/cookbooks/docker-grid/README.md
+++ b/cookbooks/docker-grid/README.md
@@ -39,11 +39,13 @@ This cookbook sets up Docker engine.
 |`['docker-grid']['yum_repo']['baseurl']`|String||`'https://yum.dockerproject.org/repo/main/centos/$releasever/'`|
 |`['docker-grid']['yum_repo']['gpgcheck']`|String|`'0'`: disabled, `'1'`: enabled.|`'1'`|
 |`['docker-grid']['yum_repo']['gpgkey']`|String||`'https://yum.dockerproject.org/gpg'`|
-|`['docker-grid']['compose']['auto_upgrade']`|String|upgrade/reinstall the docker-compose automatically.|`false`|
+|`['docker-grid']['compose']['skip_setup']`|Boolean||`false`|
+|`['docker-grid']['compose']['auto_upgrade']`|Boolean|upgrade/reinstall the docker-compose automatically.|`false`|
 |`['docker-grid']['compose']['release_base_url']`|String||`'https://github.com/docker/compose/releases/download/1.9.0'`|
 |`['docker-grid']['compose']['release_url']`|String||`"#{node['docker-grid']['compose']['release_base_url']}/docker-compose-#{node['kernel']['name']}-#{node['kernel']['machine']}"`|
 |`['docker-grid']['compose']['home_dir']`|String||`'/opt/docker-compose'`|
 |`['docker-grid']['compose']['app_dir']`|String||`"#{node['docker-grid']['compose']['home_dir']}/app`|
+|`['docker-grid']['engine']['skip_setup']`|Boolean||`false`|
 |`['docker-grid']['engine']['version_on_centos']`|String|Docker version for CentOS.|`'1.11.2-1'`|
 |`['docker-grid']['engine']['version_on_ubuntu']`|String|Docker version for Ubuntu.|`'1.11.2-0'`|
 |`['docker-grid']['engine']['version']`|String|Docker 1.9.x - 1.11.x is recommended for stability reasons. Note: this **default** value is overwritten by the `version_on_{centos or ubuntu}`.|See default.rb|

diff --git a/cookbooks/docker-grid/attributes/default.rb b/cookbooks/docker-grid/attributes/default.rb
index 4120fa1..455767a 100644 (file)
--- a/cookbooks/docker-grid/attributes/default.rb
+++ b/cookbooks/docker-grid/attributes/default.rb
@@ -30,6 +30,7 @@ default['docker-grid']['yum_repo'] = {
   'gpgkey' => 'https://yum.dockerproject.org/gpg',
 }
 
+default['docker-grid']['compose']['skip_setup'] = false
 # dockerproject: direct download.
 # Note: non-support by this cookbook.
 #   os-repository (Ubuntu): http://packages.ubuntu.com/search?keywords=docker-compose&searchon=names
@@ -40,6 +41,7 @@ default['docker-grid']['compose']['release_url'] = "#{node['docker-grid']['compo
 default['docker-grid']['compose']['home_dir'] = '/opt/docker-compose'
 default['docker-grid']['compose']['app_dir'] = "#{node['docker-grid']['compose']['home_dir']}/app"
 
+default['docker-grid']['engine']['skip_setup'] = false
 # dockerproject: 1.13.0-1, 1.12.3-1, 1.11.2-1, 1.10.3-1
 # os-repository: yum list docker
 #   http://mirror.centos.org/centos/7.3.1611/extras/x86_64/Packages/

diff --git a/cookbooks/docker-grid/metadata.rb b/cookbooks/docker-grid/metadata.rb
index afe43a7..09bd290 100644 (file)
--- a/cookbooks/docker-grid/metadata.rb
+++ b/cookbooks/docker-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
 license          'Apache 2.0'
 description      'Installs/Configures Docker Engine.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.3.4'
+version          '0.3.5'
 source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
 

diff --git a/cookbooks/docker-grid/recipes/compose.rb b/cookbooks/docker-grid/recipes/compose.rb
index 96b7e33..1c31a86 100644 (file)
--- a/cookbooks/docker-grid/recipes/compose.rb
+++ b/cookbooks/docker-grid/recipes/compose.rb
@@ -19,6 +19,11 @@
 
 # See: https://docs.docker.com/compose/install/
 
+if node['docker-grid']['compose']['skip_setup']
+  log 'Skip the Docker Compose setup.'
+  return
+end
+
 include_recipe 'docker-grid::engine'
 
 home_dir = node['docker-grid']['compose']['home_dir']

diff --git a/cookbooks/docker-grid/recipes/engine.rb b/cookbooks/docker-grid/recipes/engine.rb
index a5febb0..e494ad7 100644 (file)
--- a/cookbooks/docker-grid/recipes/engine.rb
+++ b/cookbooks/docker-grid/recipes/engine.rb
@@ -19,6 +19,11 @@
 
 # https://dcos.io/docs/1.8/administration/installing/custom/system-requirements/
 
+if node['docker-grid']['engine']['skip_setup']
+  log 'Skip the Docker Engine setup.'
+  return
+end
+
 ::Chef::Recipe.send(:include, PlatformUtils::Helper)
 ::Chef::Recipe.send(:include, PlatformUtils::VirtUtils)
 

diff --git a/roles/concourse.rb b/roles/concourse.rb
index bdaf873..71fdbe2 100644 (file)
--- a/roles/concourse.rb
+++ b/roles/concourse.rb
@@ -22,6 +22,14 @@ override_attributes(
       concourse_cn,
     ],
   },
+  'docker-grid' => {
+    'engine' => {
+      #'skip_setup' => true,  # default: false
+    },
+    'compose' => {
+      #'skip_setup' => true,  # default: false
+    },
+  },
   'concourse-ci' => {
     'with_ssl_cert_cookbook' => false,  # or true (for https)
     'ssl_cert' => {

diff --git a/roles/docker-registry.rb b/roles/docker-registry.rb
index b397dad..3e8ea28 100644 (file)
--- a/roles/docker-registry.rb
+++ b/roles/docker-registry.rb
@@ -15,6 +15,22 @@ run_list(
 registry_cn = 'registry.docker.example.com'
 
 override_attributes(
+  'ssl_cert' => {
+    'ca_names' => [
+      'grid_ca',
+    ],
+    'common_names' => [
+      registry_cn,
+    ],
+  },
+  'docker-grid' => {
+    'engine' => {
+      #'skip_setup' => true,  # default: false
+    },
+    'compose' => {
+      #'skip_setup' => true,  # default: false
+    },
+  },
   'docker-grid' => {
     'registry' => {
       'with_ssl_cert_cookbook' => true,
@@ -49,13 +65,5 @@ override_attributes(
       },
     },
   },
-  'ssl_cert' => {
-    'ca_names' => [
-      'grid_ca',
-    ],
-    'common_names' => [
-      registry_cn,
-    ],
-  }
 )
 

diff --git a/roles/jenkins.rb b/roles/jenkins.rb
index c4b93a5..5e5bfd8 100644 (file)
--- a/roles/jenkins.rb
+++ b/roles/jenkins.rb
@@ -14,6 +14,19 @@ run_list(
 jenkins_cn = 'jenkins.io.example.com'
 
 override_attributes(
+  'ssl_cert' => {
+    'common_names' => [
+      jenkins_cn,
+    ],
+  },
+  'docker-grid' => {
+    'engine' => {
+      #'skip_setup' => true,  # default: false
+    },
+    'compose' => {
+      #'skip_setup' => true,  # default: false
+    },
+  },
   'jenkins-grid' => {
     #'with_ssl_cert_cookbook' => true,
     'ssl_cert' => {
@@ -54,9 +67,4 @@ override_attributes(
       },
     },
   },
-  'ssl_cert' => {
-    'common_names' => [
-      jenkins_cn,
-    ],
-  },
 )