openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove default role-name from merge network param script"

Browse Source
This commit is contained in:
Zuul 2019-01-14 16:10:20 +00:00 committed by Gerrit Code Review
commit e8fd828d3b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
releasenotes/notes/remove-default-role-name-in-merge-nic-config-params-script-d670279038411978.yaml Normal file
View File

@ -0,0 +1,8 @@
---
other:
- |
The utility script ``tools/merge-new-params-nic-config-script.py``
previously used the ``Controller`` role by default if the ``--role-name``
argument was not specified. The argument (``--role-name``) no longer have a
default. It is now mandatory to specify the role when merging new
parameters into existing network configuration templates.

5
tools/merge-new-params-nic-config-script.py
View File

@ -39,12 +39,11 @@ def parse_opts(argv):
default=('%s/network_data.yaml') % DEFAULT_THT_DIR) default=('%s/network_data.yaml') % DEFAULT_THT_DIR)
parser.add_argument('--role-name', metavar='ROLE-NAME', parser.add_argument('--role-name', metavar='ROLE-NAME',
help="Name of the role the NIC config is used for.", help="Name of the role the NIC config is used for.",
default='Controller') required=True)
parser.add_argument('-t', '--template', metavar='TEMPLATE_FILE', parser.add_argument('-t', '--template', metavar='TEMPLATE_FILE',
help=("Existing NIC config template to merge " help=("Existing NIC config template to merge "
"parameter too."), "parameter too."),
required=True, required=True)
)
parser.add_argument('--tht-dir', metavar='THT_DIR', parser.add_argument('--tht-dir', metavar='THT_DIR',
help=("Path to tripleo-heat-templates (THT) " help=("Path to tripleo-heat-templates (THT) "
"directory"), "directory"),