openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Deprecate and ignore --skip-nodes-and-networks"

This commit is contained in:
Zuul 2021-10-11 15:24:27 +00:00 committed by Gerrit Code Review
parent 0d23aac61e 06d5544991
commit 7c44b7190e
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/utils.py
View File

@ -1798,7 +1798,7 @@ def update_working_dir_defaults(working_dir, args):
stack_name = args.stack stack_name = args.stack
tht_root = os.path.abspath(args.templates) tht_root = os.path.abspath(args.templates)
if args.baremetal_deployment: if isinstance(args.baremetal_deployment, str):
copy_to_wd(working_dir, args.baremetal_deployment, stack_name, copy_to_wd(working_dir, args.baremetal_deployment, stack_name,
'baremetal') 'baremetal')

25
tripleoclient/v1/overcloud_deploy.py
View File

@ -299,7 +299,7 @@ class DeployOvercloud(command.Command):
new_tht_root, new_tht_root,
constants.DEPLOYED_SERVER_ENVIRONMENT)) constants.DEPLOYED_SERVER_ENVIRONMENT))
if not parsed_args.skip_nodes_and_networks: if parsed_args.baremetal_deployment is not None:
created_env_files.extend( created_env_files.extend(
self._provision_networks(parsed_args, new_tht_root, self._provision_networks(parsed_args, new_tht_root,
protected_overrides)) protected_overrides))
@ -915,10 +915,16 @@ class DeployOvercloud(command.Command):
'the deployment actions. This may need to ' 'the deployment actions. This may need to '
'be used if deploying on a python2 host ' 'be used if deploying on a python2 host '
'from a python3 system or vice versa.')) 'from a python3 system or vice versa.'))
parser.add_argument('-b', '--baremetal-deployment', parser.add_argument(
metavar='<baremetal_deployment.yaml>', '-b', '--baremetal-deployment',
help=_('Configuration file describing the ' metavar='<baremetal_deployment.yaml>',
'baremetal deployment')) nargs='?',
const=True,
help=_('Deploy baremetal nodes, network and virtual IP addresses '
'as defined in baremetal_deployment.yaml along with '
'overcloud. If no baremetal_deployment YAML file is given, '
'the tripleo-<stack_name>-baremetal-deployment.yaml file '
'in the working-dir will be used.'))
parser.add_argument('--network-config', parser.add_argument('--network-config',
help=_('Apply network config to provisioned ' help=_('Apply network config to provisioned '
'nodes.'), 'nodes.'),
@ -1024,11 +1030,10 @@ class DeployOvercloud(command.Command):
'--skip-nodes-and-networks', '--skip-nodes-and-networks',
action='store_true', action='store_true',
default=False, default=False,
help=_('When this is set no Baremetal Nodes, Networks nor Virtual ' help=_('DEPRECATED - This option is ignored if used. '
'IPs will be provisioned. The resources are assumed to ' 'The --baremetal-deployment option must be used to enable '
'already be provisioned. The environment files including ' 'provisioning of all resources, Baremetal nodes as well as'
'the necessary input for the stack create must be provided ' 'Networks and Virtual IPs')
'by the user.')
) )
parser.add_argument( parser.add_argument(
'--disable-protected-resource-types', '--disable-protected-resource-types',