Merge "Add passwords_env parameter to generate_passwords"

This commit is contained in:
Zuul 2021-03-20 01:44:32 +00:00 committed by Gerrit Code Review
commit a9846a90aa
1 changed files with 7 additions and 3 deletions

View File

@ -49,7 +49,8 @@ def default_image_params():
def generate_passwords(swift=None, heat=None,
container=constants.DEFAULT_CONTAINER_NAME,
rotate_passwords=False, rotate_pw_list=None):
rotate_passwords=False, rotate_pw_list=None,
passwords_env=None):
"""Generates passwords needed for Overcloud deployment
This method generates passwords. By default, this method respects
@ -65,9 +66,12 @@ def generate_passwords(swift=None, heat=None,
if rotate_pw_list is None:
rotate_pw_list = []
if heat is None:
if passwords_env:
stack_env = passwords_env
placement_extracted = True
elif heat is None:
stack_env = None
placement_extracted = False
placement_extracted = True
else:
try:
stack_env = heat.stacks.environment(