cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix and refix help text for CLI (#55831)

Browse source 
fixes #23395 giving clearer information on installed role path
  re-fixes 'home display issue' for module-path
This commit is contained in:
Brian Coca 2019-04-30 11:16:26 -04:00 committed by Sam Doran
parent 11279a909d
commit 45d21b6474
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changelogs/fragments/help_paths_fixes.yml Normal file
View file

@ -0,0 +1,3 @@
bugfixes:
- re-fix CLI help for module path, previous fix which was lost in parser switch
- Clarify roles path target behaviour for ansible-galaxy

3
lib/ansible/cli/arguments/option_helpers.py
View file

@ -282,8 +282,9 @@ def add_meta_options(parser):
def add_module_options(parser): def add_module_options(parser):
"""Add options for commands that load modules""" """Add options for commands that load modules"""
module_path = C.config.get_configuration_definition('DEFAULT_MODULE_PATH').get('default', '')
parser.add_argument('-M', '--module-path', dest='module_path', default=None, parser.add_argument('-M', '--module-path', dest='module_path', default=None,
help="prepend colon-separated path(s) to module library (default=%s)" % C.DEFAULT_MODULE_PATH, help="prepend colon-separated path(s) to module library (default=%s)" % module_path,
type=unfrack_path(pathsep=True), action=PrependListAction) type=unfrack_path(pathsep=True), action=PrependListAction)

5
lib/ansible/cli/galaxy.py
View file

@ -63,11 +63,12 @@ class GalaxyCLI(CLI):
offline.add_argument('--offline', dest='offline', default=False, action='store_true', offline.add_argument('--offline', dest='offline', default=False, action='store_true',
help="Don't query the galaxy API when creating roles") help="Don't query the galaxy API when creating roles")
default_roles_path = C.config.get_configuration_definition('DEFAULT_ROLES_PATH').get('default', '')
roles_path = opt_help.argparse.ArgumentParser(add_help=False) roles_path = opt_help.argparse.ArgumentParser(add_help=False)
roles_path.add_argument('-p', '--roles-path', dest='roles_path', type=opt_help.unfrack_path(pathsep=True), roles_path.add_argument('-p', '--roles-path', dest='roles_path', type=opt_help.unfrack_path(pathsep=True),
default=C.DEFAULT_ROLES_PATH, action=opt_help.PrependListAction, default=C.DEFAULT_ROLES_PATH, action=opt_help.PrependListAction,
help='The path to the directory containing your roles. The default is the roles_path ' help='The path to the directory containing your roles. The default is the first writable one'
'configured in your ansible.cfg file (/etc/ansible/roles if not configured)') 'configured via DEFAULT_ROLES_PATH: %s ' % default_roles_path)
force = opt_help.argparse.ArgumentParser(add_help=False) force = opt_help.argparse.ArgumentParser(add_help=False)
force.add_argument('-f', '--force', dest='force', action='store_true', default=False, help='Force overwriting an existing role') force.add_argument('-f', '--force', dest='force', action='store_true', default=False, help='Force overwriting an existing role')