• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

Grid環境構築用のChefリポジトリです。


コミットメタ情報

リビジョン3f451365ff88512a809c1cd1d40aa4a7594c3603 (tree)
日時2017-12-02 20:50:14
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

refactoring.

変更サマリ

差分

--- a/cookbooks/screwdriver/.rubocop.yml
+++ b/cookbooks/screwdriver/.rubocop.yml
@@ -12,6 +12,8 @@ Metrics/AbcSize:
1212 Enabled: false
1313 Metrics/BlockNesting:
1414 Max: 5
15+Style/CommentIndentation:
16+ Enabled: false
1517 Style/PerlBackrefs:
1618 Enabled: false
1719 Security/Eval:
--- a/cookbooks/screwdriver/attributes/default.rb
+++ b/cookbooks/screwdriver/attributes/default.rb
@@ -154,7 +154,7 @@ default['screwdriver']['api']['scms_vault_items'] = {
154154 'key' => 'secret', # real hash path: "/secret"
155155 # or nested hash password path delimited by slash
156156 #'env_context' => true,
157- #'key' => 'hash/path/to/secret', # real hash path: "/#{node.chef_environment}/hash/path/to/secret"
157+ #'key' => 'hash/path/to/secret', # real hash path: "/#{node.chef_environment}/hash/path/to/secret"
158158 },
159159 },
160160 'scm_b' => {
@@ -297,7 +297,7 @@ EOS
297297 # **DEPRECATED**: Please use the above `['screwdriver']['api']['config']['scms']` attribute
298298 # instead of `SCM_SETTINGS` env. variable.
299299 # 'SCM_SETTINGS' => '{}',
300- #
300+ #
301301 # **DEPRECATED**: Non-Multiple SCMs setting format.
302302 # - Note: Multiple SCMs not supported yet.
303303 # https://github.com/screwdriver-cd/screwdriver/issues/365
--- a/roles/screwdriver-on-docker.rb
+++ b/roles/screwdriver-on-docker.rb
@@ -28,15 +28,23 @@ run_list(
2828 )
2929
3030 override_attributes(
31+ 'docker-grid' => {
32+ 'engine' => {
33+ #'skip_setup' => true, # default: false
34+ },
35+ 'compose' => {
36+ #'skip_setup' => true, # default: false
37+ },
38+ },
3139 'screwdriver' => {
3240 'api' => {
3341 'config' => {
3442 'scms' => {
43+ # **REQUIRED**: SCM settings
44+=begin
3545 'github.com' => { # id and display name
3646 'plugin' => 'github',
3747 'config' => {
38- # **REQUIRED**: SCM OAuth client ID, secret and webhook secret (GitHub only)
39-=begin
4048 # These 3 secrets should be set by the following `['screwdriver']['api']['scms_vault_items']` attribute.
4149 'oauthClientId' => 'YOU-PROBABLY-WANT-SOMETHING-HERE', # The client id used for OAuth with github. GitHub OAuth (https://developer.github.com/v3/oauth/)
4250 'oauthClientSecret' => 'AGAIN-SOMETHING-HERE-IS-USEFUL', # The client secret used for OAuth with github
@@ -45,9 +53,9 @@ override_attributes(
4553 'username' => 'sd-buildbot', # [Optional] Username for code checkout
4654 'email' => 'dev-null@screwdriver.cd', # [Optional] Email for code checkout
4755 '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)
48-=end
4956 },
5057 },
58+=end
5159 },
5260 },
5361 },
旧リポジトリブラウザで表示