From c740b542147f7e53cac12c46860bf8228d6ae5f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Mon, 7 Jan 2019 22:38:02 +0100 Subject: [PATCH] Remove default role-name from merge network param script The merge-new-params-nic-config-script.py previosly had the 'Controller' role as the default for --role-name. It is not obvious that this parameter must be changed when merging nic config templates. Remove the default and make the argument required. Improves UX since user error is less likely. Making the mistake of using a Role with too many networks is'nt as forgiving since we now only pass parameters for the role.networks. Related-Bug: #1800811 Change-Id: Iff9e364db66ad09a30ac10a7814a3c01d50caf58 --- ...n-merge-nic-config-params-script-d670279038411978.yaml | 8 ++++++++ tools/merge-new-params-nic-config-script.py | 5 ++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 releasenotes/notes/remove-default-role-name-in-merge-nic-config-params-script-d670279038411978.yaml diff --git a/releasenotes/notes/remove-default-role-name-in-merge-nic-config-params-script-d670279038411978.yaml b/releasenotes/notes/remove-default-role-name-in-merge-nic-config-params-script-d670279038411978.yaml new file mode 100644 index 0000000000..bfc91d46e0 --- /dev/null +++ b/releasenotes/notes/remove-default-role-name-in-merge-nic-config-params-script-d670279038411978.yaml @@ -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. diff --git a/tools/merge-new-params-nic-config-script.py b/tools/merge-new-params-nic-config-script.py index 910e0e88a1..8e8c1343ec 100755 --- a/tools/merge-new-params-nic-config-script.py +++ b/tools/merge-new-params-nic-config-script.py @@ -39,12 +39,11 @@ def parse_opts(argv): default=('%s/network_data.yaml') % DEFAULT_THT_DIR) parser.add_argument('--role-name', metavar='ROLE-NAME', help="Name of the role the NIC config is used for.", - default='Controller') + required=True) parser.add_argument('-t', '--template', metavar='TEMPLATE_FILE', help=("Existing NIC config template to merge " "parameter too."), - required=True, - ) + required=True) parser.add_argument('--tht-dir', metavar='THT_DIR', help=("Path to tripleo-heat-templates (THT) " "directory"),