openstack/kayobe
Code Issues Proposed changes

Fix help texts of inventory options

Browse Source 
Passing the Kayobe or Kolla Ansible inventories as comma-separated host
list was never supported since we check that inventory directories
exist.

Also fix the check for the Kolla Ansible inventory directory, which was
using the wrong variable (parsed_args.kolla_venv).

Change-Id: I215f927d8249aadd9cc7bb44893e0bdf5f26510a
(cherry picked from commit e0b180e135)
This commit is contained in:
Pierre Riteau 2021-04-02 14:31:15 +02:00
parent d64d415fac
commit d8f640f1ba
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kayobe/ansible.py
View File

@ -51,8 +51,7 @@ def add_args(parser):
"YAML/JSON") "YAML/JSON")
parser.add_argument("-i", "--inventory", metavar="INVENTORY", parser.add_argument("-i", "--inventory", metavar="INVENTORY",
help="specify inventory host path " help="specify inventory host path "
"(default=$%s/inventory or %s/inventory) or " "(default=$%s/inventory or %s/inventory) " %
"comma-separated host list" %
(CONFIG_PATH_ENV, DEFAULT_CONFIG_PATH)) (CONFIG_PATH_ENV, DEFAULT_CONFIG_PATH))
parser.add_argument("-l", "--limit", metavar="SUBSET", parser.add_argument("-l", "--limit", metavar="SUBSET",
help="further limit selected hosts to an additional " help="further limit selected hosts to an additional "

6
kayobe/kolla_ansible.py
View File

@ -50,8 +50,8 @@ def add_args(parser):
"YAML/JSON for Kolla Ansible") "YAML/JSON for Kolla Ansible")
parser.add_argument("-ki", "--kolla-inventory", metavar="INVENTORY", parser.add_argument("-ki", "--kolla-inventory", metavar="INVENTORY",
help="specify inventory host path " help="specify inventory host path "
"(default=$%s/inventory or %s/inventory) or " "(default=$%s/inventory or %s/inventory) for "
"comma-separated host list for Kolla Ansible" % "Kolla Ansible" %
(CONFIG_PATH_ENV, DEFAULT_CONFIG_PATH)) (CONFIG_PATH_ENV, DEFAULT_CONFIG_PATH))
parser.add_argument("-kl", "--kolla-limit", metavar="SUBSET", parser.add_argument("-kl", "--kolla-limit", metavar="SUBSET",
help="further limit selected hosts to an additional " help="further limit selected hosts to an additional "
@ -87,7 +87,7 @@ def _validate_args(parsed_args, inventory_filename):
sys.exit(1) sys.exit(1)
inventory = _get_inventory_path(parsed_args, inventory_filename) inventory = _get_inventory_path(parsed_args, inventory_filename)
result = utils.is_readable_dir(parsed_args.kolla_venv) result = utils.is_readable_dir(inventory)
if not result["result"]: if not result["result"]:
# NOTE(mgoddard): Previously the inventory was a file, now it is a # NOTE(mgoddard): Previously the inventory was a file, now it is a
# directory to allow us to support inventory host_vars. Support both # directory to allow us to support inventory host_vars. Support both