openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Add handling for roles and networks to answers" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2022-07-03 09:43:43 +00:00 committed by Gerrit Code Review
commit 6fced2c2c6
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
releasenotes/notes/add-roles-and-networks-answers-f23927c9075c7e99.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
Users can now specify roles_data.yaml and network_data.yaml locations
in their answers file. Using `networks` and `roles` along with their
`templates` and `environments` arguments.

26
tripleoclient/v1/overcloud_deploy.py
View File

@ -63,16 +63,24 @@ class DeployOvercloud(command.Command):
parsed_args.deployed_server = True
def _update_args_from_answers_file(self, args):
if args.answers_file is not None:
with open(args.answers_file, 'r') as answers_file:
answers = yaml.safe_load(answers_file)
if args.answers_file is None:
return
if args.templates is None:
args.templates = answers['templates']
if 'environments' in answers:
if args.environment_files is not None:
answers['environments'].extend(args.environment_files)
args.environment_files = answers['environments']
with open(args.answers_file, 'r') as answers_file:
answers = yaml.safe_load(answers_file)
if args.templates is None:
args.templates = answers['templates']
if 'environments' in answers:
if args.environment_files is not None:
answers['environments'].extend(args.environment_files)
args.environment_files = answers['environments']
if 'roles' in answers:
if args.roles_file is None:
args.roles_file = answers['roles']
if 'networks' in answers:
if args.networks_file is None:
args.networks_file = answers['networks']
def _update_parameters(self, args, parameters,
tht_root, user_tht_root):