Add passwords_env parameter to generate_passwords
Add a new parameter, passwords_env to the generate_passwords function that can be used to pass in a Heat environment dict of existing password values. If the value is not None, it will be used instead of attempting to query Heat for the stack environment. The paramter will allow for re-using a set of existing passwords without having to have an existing Heat stack. Signed-off-by: James Slagle <jslagle@redhat.com> Change-Id: I99b488842261775dbbb0308c070e440f71b5be41
This commit is contained in:
parent
90f52081ff
commit
138e7f316c
|
@ -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(
|
||||
|
|
Loading…
Reference in New Issue