refactoring.

diff --git a/cookbooks/screwdriver/.rubocop.yml b/cookbooks/screwdriver/.rubocop.yml
index a4407c1..b411b17 100644 (file)
--- a/cookbooks/screwdriver/.rubocop.yml
+++ b/cookbooks/screwdriver/.rubocop.yml
@@ -12,6 +12,8 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/BlockNesting:
   Max: 5
+Style/CommentIndentation:
+  Enabled: false
 Style/PerlBackrefs:
   Enabled: false
 Security/Eval:

diff --git a/cookbooks/screwdriver/attributes/default.rb b/cookbooks/screwdriver/attributes/default.rb
index 4d548d8..b01d6bf 100644 (file)
--- a/cookbooks/screwdriver/attributes/default.rb
+++ b/cookbooks/screwdriver/attributes/default.rb
@@ -154,7 +154,7 @@ default['screwdriver']['api']['scms_vault_items'] = {
       'key' => 'secret',  # real hash path: "/secret"
       # or nested hash password path delimited by slash
       #'env_context' => true,
-      #'key' => 'hash/path/to/secret',  # real hash path: "/#{node.chef_environment}/hash/path/to/secret"    
+      #'key' => 'hash/path/to/secret',  # real hash path: "/#{node.chef_environment}/hash/path/to/secret"
     },
   },
   'scm_b' => {
@@ -297,7 +297,7 @@ EOS
         # **DEPRECATED**: Please use the above `['screwdriver']['api']['config']['scms']` attribute
         # instead of `SCM_SETTINGS` env. variable.
         # 'SCM_SETTINGS' => '{}',
-        # 
+        #
         # **DEPRECATED**: Non-Multiple SCMs setting format.
         #   - Note: Multiple SCMs not supported yet.
         #     https://github.com/screwdriver-cd/screwdriver/issues/365

diff --git a/roles/screwdriver-on-docker.rb b/roles/screwdriver-on-docker.rb
index 6891ddc..f8f707e 100644 (file)
--- a/roles/screwdriver-on-docker.rb
+++ b/roles/screwdriver-on-docker.rb
@@ -28,15 +28,23 @@ run_list(
 )
 
 override_attributes(
+  'docker-grid' => {
+    'engine' => {
+      #'skip_setup' => true,  # default: false
+    },
+    'compose' => {
+      #'skip_setup' => true,  # default: false
+    },
+  },
   'screwdriver' => {
     'api' => {
       'config' => {
         'scms' => {
+          # **REQUIRED**: SCM settings
+=begin
           'github.com' => {  # id and display name
             'plugin' => 'github',
             'config' => {
-              # **REQUIRED**: SCM OAuth client ID, secret and webhook secret (GitHub only)
-=begin
               # These 3 secrets should be set by the following `['screwdriver']['api']['scms_vault_items']` attribute.
               'oauthClientId' => 'YOU-PROBABLY-WANT-SOMETHING-HERE',  # The client id used for OAuth with github. GitHub OAuth (https://developer.github.com/v3/oauth/)
               'oauthClientSecret' => 'AGAIN-SOMETHING-HERE-IS-USEFUL',  # The client secret used for OAuth with github
@@ -45,9 +53,9 @@ override_attributes(
               'username' => 'sd-buildbot',  # [Optional] Username for code checkout
               'email' => 'dev-null@screwdriver.cd',  # [Optional] Email for code checkout
               'privateRepo' => false,  # [Optional] Set to true to support private repo; will need read and write access to public and private repos (https://developer.github.com/v3/oauth/#scopes)
-=end
             },
           },
+=end
         },
       },
     },