From cd4e875701ea317a7d51e21b050117ae059164d8 Mon Sep 17 00:00:00 2001 From: whitestar Date: Sun, 12 Aug 2018 12:50:16 +0900 Subject: [PATCH] fix loading secrets from local env. --- cookbooks/screwdriver/recipes/docker-compose.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cookbooks/screwdriver/recipes/docker-compose.rb b/cookbooks/screwdriver/recipes/docker-compose.rb index 1a6cbef..29c85aa 100644 --- a/cookbooks/screwdriver/recipes/docker-compose.rb +++ b/cookbooks/screwdriver/recipes/docker-compose.rb @@ -222,14 +222,14 @@ end =end db_username = nil -db_username = env_local['DATASTORE_SEQUELIZE_USERNAME'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_USERNAME'].nil? +db_username = env_local['DB_USERNAME'] if !env_local.nil? && !env_local['DB_USERNAME'].nil? db_username_vault_item = node['screwdriver']['db_username_vault_item'] db_username = get_vault_item_value(db_username_vault_item) unless db_username_vault_item.empty? db_username = 'sd-admin' if db_username.nil? api_envs['DATASTORE_SEQUELIZE_USERNAME'] = '${DB_USERNAME}' db_password = nil -db_password = env_local['DATASTORE_SEQUELIZE_PASSWORD'] if !env_local.nil? && !env_local['DATASTORE_SEQUELIZE_PASSWORD'].nil? +db_password = env_local['DB_PASSWORD'] if !env_local.nil? && !env_local['DB_PASSWORD'].nil? db_password_vault_item = node['screwdriver']['db_password_vault_item'] db_password = get_vault_item_value(db_password_vault_item) unless db_password_vault_item.empty? db_password = SecureRandom.urlsafe_base64(32) if db_password.nil? -- 2.11.0