From 5b00837494686c9b843d6a54d0bba6c5b397876a Mon Sep 17 00:00:00 2001 From: Jaganathan Palanisamy Date: Tue, 4 Sep 2018 02:27:41 -0400 Subject: [PATCH] Passwords mismatches when using custom plan env Passwords are differed when using custom plan environment with -p or --plan-environment-file option during plan update. Passwords are loaded from environment file when updating plan with custom plan environment file. Need to update the logic to invoke load passwords when using custom plan environment file also. Change-Id: Ic206351ced77088f70e9e1fc25270b2c097b349b Closes-Bug: #1790580 (cherry picked from commit 764a5a65b08bd1f9c22e25866025c191725c11ac) --- tripleoclient/workflows/plan_management.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tripleoclient/workflows/plan_management.py b/tripleoclient/workflows/plan_management.py index eb91beff6..91aac745f 100644 --- a/tripleoclient/workflows/plan_management.py +++ b/tripleoclient/workflows/plan_management.py @@ -195,7 +195,7 @@ def update_plan_from_templates(clients, name, tht_root, roles_file=None, _list_user_files(swift_client, name)))) keep_file_contents = _load_content_or_file( swift_client, name, keep_map) - elif not plan_env_file: + else: passwords = _load_passwords(swift_client, name) # TODO(dmatthews): Removing the existing plan files should probably be