updates dcos roles.

diff --git a/roles/dcos-boot.rb b/roles/dcos-boot.rb
new file mode 100644 (file)
index 0000000..36f9b17
--- /dev/null
+++ b/roles/dcos-boot.rb
@@ -0,0 +1,24 @@
+cluster_name = 'dcos'
+
+name "#{cluster_name}-boot"
+description "#{cluster_name} cluster bootstrap node"
+
+run_list(
+  "role[#{cluster_name}]",
+  'role[docker4dcos]',
+  'recipe[dcos-grid::bootstrap]',
+)
+
+#env_run_lists
+
+default_attributes(
+)
+
+override_attributes(
+  'docker-grid' => {
+    'engine' => {
+      # deactivates it for bootstrap setup
+      'userns-remap' => '',
+    },
+  },
+)

diff --git a/roles/dcos-gp-node.rb b/roles/dcos-gp-node.rb
new file mode 100644 (file)
index 0000000..df2e334
--- /dev/null
+++ b/roles/dcos-gp-node.rb
@@ -0,0 +1,23 @@
+cluster_name = 'dcos'
+
+name "#{cluster_name}-gp-node"
+description "#{cluster_name} cluster general-purpose node"
+
+run_list(
+  'role[docker4dcos]',
+  "role[#{cluster_name}]",
+  'recipe[dcos-grid::gp-node]',
+)
+
+#env_run_lists
+
+default_attributes(
+)
+
+override_attributes(
+  'dcos-grid' => {
+    'node' => {
+      'auto_setup' => false,
+    },
+  },
+)

diff --git a/roles/dcos.rb b/roles/dcos.rb
new file mode 100644 (file)
index 0000000..c4ad231
--- /dev/null
+++ b/roles/dcos.rb
@@ -0,0 +1,72 @@
+cluster_name = 'dcos'
+
+name cluster_name
+description "#{cluster_name} cluster"
+
+run_list(
+  'recipe[platform_utils::platform_update]',
+)
+
+#env_run_lists
+
+bootstrap_ip = '192.168.10.100'
+master_list = [
+  '192.168.10.101',
+  '192.168.10.102',
+  '192.168.10.103',
+]
+resolvers = [
+  '8.8.8.8',
+  '8.8.4.4',
+]
+
+default_attributes(
+)
+
+override_attributes(
+  'platform_utils' => {
+    'platform_update' => {
+      'auto_update' => true,
+    },
+  },
+  'dcos-grid' => {
+    #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/dcos_generate_config.sh',
+    'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/dcos_generate_config.sh',
+    # 1.8.6
+    #'dcos_release_url' => 'https://downloads.dcos.io/dcos/stable/commit/cfccfbf84bbba30e695ae4887b65db44ff216b1d/dcos_generate_config.sh',
+    # 1.7-open
+    #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/commit/14509fe1e7899f439527fb39867194c7a425c771/dcos_generate_config.sh',
+    'dcos_cli_release_url' => 'https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.8/dcos',
+    'bootstrap' => {
+      'ip' => bootstrap_ip,
+      'port' => '8080',
+      'config' => {
+        'cluster_name' => cluster_name,
+        'master_list' => master_list,
+        'resolvers' => resolvers,
+        'oauth_enabled' => 'false',
+        'telemetry_enabled' => 'false',
+=begin
+        'dcos_overlay_network' => {
+          'vtep_subnet' => '44.128.0.0/20',
+          'vtep_mac_oui' => '70:B3:D5:00:00:00',
+          'overlays' => [
+            {
+              'name' => 'dcos',
+              'subnet' => '9.0.0.0/8',
+              'prefix' => '26',
+            },
+          ],
+        },
+=end
+      },
+      'ip-detect' => {
+        # the first detected interface's ip is adopted.
+        'interface' => 'eth1,eth0,enp0s8,enp0s3',
+      },
+    },
+    'node' => {
+      'auto_setup' => false,
+    },
+  },
+)

diff --git a/roles/dcos0.rb b/roles/dcos0.rb
index e0f0bbc..ba63377 100644 (file)
--- a/roles/dcos0.rb
+++ b/roles/dcos0.rb
@@ -9,6 +9,17 @@ run_list(
 
 #env_run_lists
 
+bootstrap_ip = '192.168.56.100'
+master_list = [
+  '192.168.56.101',
+  '192.168.56.102',
+  '192.168.56.103',
+]
+resolvers = [
+  '8.8.8.8',
+  '8.8.4.4',
+]
+
 default_attributes(
 )
 
@@ -27,25 +38,14 @@ override_attributes(
     #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/commit/14509fe1e7899f439527fb39867194c7a425c771/dcos_generate_config.sh',
     'dcos_cli_release_url' => 'https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.8/dcos',
     'bootstrap' => {
-      'ip' => '192.168.56.100',
+      'ip' => bootstrap_ip,
       'port' => '8080',
       'config' => {
         'cluster_name' => cluster_name,
-        'master_list' => [
-          '192.168.56.101',
-          '192.168.56.102',
-          '192.168.56.103',
-        ],
-        'resolvers' => [
-          '8.8.8.8',
-          '8.8.4.4',
-          #{
-          #  'invalid_name' => 'dummy',
-          #},
-        ],
+        'master_list' => master_list,
+        'resolvers' => resolvers,
         'oauth_enabled' => 'false',
         'telemetry_enabled' => 'false',
-        #'invalid_key' => 'dummy',
 =begin
         'dcos_overlay_network' => {
           'vtep_subnet' => '44.128.0.0/20',

diff --git a/roles/dcos1.rb b/roles/dcos1.rb
index a8122a1..1979aa8 100644 (file)
--- a/roles/dcos1.rb
+++ b/roles/dcos1.rb
@@ -9,6 +9,17 @@ run_list(
 
 #env_run_lists
 
+bootstrap_ip = '10.1.3.100'
+master_list = [
+  '10.1.3.101',
+  '10.1.3.102',
+  '10.1.3.103',
+]
+resolvers = [
+  '8.8.8.8',
+  '8.8.4.4',
+]
+
 default_attributes(
 )
 
@@ -40,19 +51,12 @@ override_attributes(
     #'dcos_release_url' => 'https://downloads.dcos.io/dcos/EarlyAccess/commit/14509fe1e7899f439527fb39867194c7a425c771/dcos_generate_config.sh',
     'dcos_cli_release_url' => 'https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.8/dcos',
     'bootstrap' => {
-      'ip' => '10.1.3.100',
+      'ip' => bootstrap_ip,
       'port' => '8080',
       'config' => {
         'cluster_name' => cluster_name,
-        'master_list' => [
-          '10.1.3.101',
-          '10.1.3.102',
-          '10.1.3.103',
-        ],
-        'resolvers' => [
-          '8.8.8.8',
-          '8.8.4.4',
-        ],
+        'master_list' => master_list,
+        'resolvers' => resolvers,
         'oauth_enabled' => 'false',
         'telemetry_enabled' => 'false',
 =begin