dcos-grid-0.4.1

diff --git a/cookbooks/dcos-grid/CHANGELOG.md b/cookbooks/dcos-grid/CHANGELOG.md
index d7341e0..87976ab 100644 (file)
--- a/cookbooks/dcos-grid/CHANGELOG.md
+++ b/cookbooks/dcos-grid/CHANGELOG.md
@@ -1,6 +1,11 @@
 dcos-grid CHANGELOG
 ===================
 
+0.4.1
+-----
+- updates `docker-grid` cookbook dependency.
+- adds `['dcos-grid']['bootstrap']['config']['telemetry_enabled']` attribute's default value `'false'`,
+
 0.4.0
 -----
 - separates the `docker-grid` cookbook.

diff --git a/cookbooks/dcos-grid/README.md b/cookbooks/dcos-grid/README.md
index 09b2d80..735d330 100644 (file)
--- a/cookbooks/dcos-grid/README.md
+++ b/cookbooks/dcos-grid/README.md
@@ -75,6 +75,7 @@ This cookbook sets up your customized DC/OS cluster on bare metal, virtual machi
 |`['dcos-grid']['bootstrap']['config']['oauth_enabled']`|String|(ver. 0.3.2 or later)|`'true'`|
 |`['dcos-grid']['bootstrap']['config']['oauth_issuer_url']`|String|(ver. 0.3.2 or later)|`'https://dcos.auth0.com/'`|
 |`['dcos-grid']['bootstrap']['config']['resolvers']`|Array|e.g. `['8.8.8.8','8.8.4.4']` (Google DNS)|`nil`|
+|`['dcos-grid']['bootstrap']['config']['telemetry_enabled']`|String||`'false'` (ver. 0.4.1 or later)|
 |`['dcos-grid']['bootstrap']['bootstrap']['ip-detect']['interface']`|String|Network interface on each node for the `ip-detect` script. Note: If you set comma-delimited interface list (e.g. `'eth0,enp0s3'`), the first detected interface's ip is adopted (ver. 0.3.0 or later). |`'eth0'`|
 |`['dcos-grid']['node']['auto_setup']`|Boolean|execute the node setup script automatically or not.|`false`|
 |`['dcos-grid']['cloud-config']['target_platform']`|String|CoreOS only now.|`'coreos'`|

diff --git a/cookbooks/dcos-grid/attributes/default.rb b/cookbooks/dcos-grid/attributes/default.rb
index 9bae136..f38cc6a 100644 (file)
--- a/cookbooks/dcos-grid/attributes/default.rb
+++ b/cookbooks/dcos-grid/attributes/default.rb
@@ -63,6 +63,7 @@ default['dcos-grid']['bootstrap']['config'] = {
     #'8.8.8.8',
     #'8.8.4.4',
   ],
+  'telemetry_enabled' => 'false',
 }
 default['dcos-grid']['bootstrap']['ip-detect'] = {
   'interface' => 'eth0',

diff --git a/cookbooks/dcos-grid/metadata.rb b/cookbooks/dcos-grid/metadata.rb
index 0f090d7..ea4f8f2 100644 (file)
--- a/cookbooks/dcos-grid/metadata.rb
+++ b/cookbooks/dcos-grid/metadata.rb
@@ -5,7 +5,7 @@ maintainer_email ''
 license          'Apache 2.0'
 description      'Installs/Configures DC/OS Cluster Node.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.4.0'
+version          '0.4.1'
 source_url       'http://scm.osdn.jp/gitroot/metasearch/grid-chef-repo.git'
 issues_url       'https://osdn.jp/projects/metasearch/ticket'
 
@@ -16,4 +16,4 @@ end
 supports 'ubuntu', '>= 16.04'
 
 # external cookbooks
-depends 'docker-grid', '>= 0.1.0'
+depends 'docker-grid', '>= 0.2.0'

diff --git a/roles/dcos0-boot.rb b/roles/dcos0-boot.rb
index 173475e..7382ed9 100644 (file)
--- a/roles/dcos0-boot.rb
+++ b/roles/dcos0-boot.rb
@@ -14,4 +14,10 @@ default_attributes(
 )
 
 override_attributes(
+  'docker-grid' => {
+    'engine' => {
+      # deactivates it for bootstrap setup
+      'userns-remap' => '',
+    },
+  },
 )

diff --git a/roles/dcos0.rb b/roles/dcos0.rb
index 2428fd9..e4a9d00 100644 (file)
--- a/roles/dcos0.rb
+++ b/roles/dcos0.rb
@@ -4,6 +4,7 @@ name cluster_name
 description "#{cluster_name} cluster"
 
 run_list(
+  'role[docker4dcos]',
 )
 
 #env_run_lists
@@ -12,12 +13,6 @@ default_attributes(
 )
 
 override_attributes(
-  'docker-grid' => {
-    'engine' => {
-      'version_on_centos' => '1.11.2-1',
-      'version_on_ubuntu' => '1.11.2-0',
-    },
-  },
   'dcos-grid' => {
     'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh',
     #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh',