• R/O
  • HTTP
  • SSH
  • HTTPS

grid-chef-repo: コミット

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


コミットメタ情報

リビジョンcd4e875701ea317a7d51e21b050117ae059164d8 (tree)
日時2018-08-12 12:50:16
作者whitestar <whitestar@user...>
コミッターwhitestar

ログメッセージ

fix loading secrets from local env.

変更サマリ

差分

--- a/cookbooks/screwdriver/recipes/docker-compose.rb
+++ b/cookbooks/screwdriver/recipes/docker-compose.rb
@@ -222,14 +222,14 @@ end
222222 =end
223223
224224 db_username = nil
225-db_username = env_local['DATASTORE_SEQUELIZE_USERNAME'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_USERNAME'].nil?
225+db_username = env_local['DB_USERNAME'] if !env_local.nil? && !env_local['DB_USERNAME'].nil?
226226 db_username_vault_item = node['screwdriver']['db_username_vault_item']
227227 db_username = get_vault_item_value(db_username_vault_item) unless db_username_vault_item.empty?
228228 db_username = 'sd-admin' if db_username.nil?
229229 api_envs['DATASTORE_SEQUELIZE_USERNAME'] = '${DB_USERNAME}'
230230
231231 db_password = nil
232-db_password = env_local['DATASTORE_SEQUELIZE_PASSWORD'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_PASSWORD'].nil?
232+db_password = env_local['DB_PASSWORD'] if !env_local.nil? && !env_local['DB_PASSWORD'].nil?
233233 db_password_vault_item = node['screwdriver']['db_password_vault_item']
234234 db_password = get_vault_item_value(db_password_vault_item) unless db_password_vault_item.empty?
235235 db_password = SecureRandom.urlsafe_base64(32) if db_password.nil?
旧リポジトリブラウザで表示