openstack
/
tripleo-validations
Code Issues Proposed changes

Add undercloud-key-file and ssh_network options. 

To enable the execution via ssh into the Undercloud node it's
required to pass also the ansible_ssh_user private key. This
options is part of the tripleo_common inventory.py, but defaults
to None.
This patch allows to pass this parameter in case it's needed.

Also, this patch allows to pass a different value for the host_network
parameter in TripleoInventory instantiation. Setting it by default to
ctlplane.

Change-Id: Id303f356c1b06906aa5aae43b0032bb80a712508
Related-Bug: #1832932
(cherry picked from commit db30779959)
This commit is contained in:
Jose Luis Franco Arza 2019-08-14 16:16:15 +02:00 committed by Sofer Athlan-Guyot
parent 77085bbec2
commit 83f84fa6cf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/tripleo-ansible-inventory
View File

@ -57,6 +57,8 @@ opts = [
cfg.StrOpt('undercloud-connection', default=inv.UNDERCLOUD_CONNECTION_SSH, cfg.StrOpt('undercloud-connection', default=inv.UNDERCLOUD_CONNECTION_SSH,
help=('Ansible connection to the undercloud, either "local" ' help=('Ansible connection to the undercloud, either "local" '
'or "ssh". Defaults to "local".')), 'or "ssh". Defaults to "local".')),
cfg.StrOpt('undercloud-key-file', default=None),
cfg.StrOpt('ssh-network', default='ctlplane'),
cfg.StrOpt('ansible_python_interpreter', default=None), cfg.StrOpt('ansible_python_interpreter', default=None),
cfg.BoolOpt('debug', help='Print tracebacks for exceptions') cfg.BoolOpt('debug', help='Print tracebacks for exceptions')
] ]
@ -137,7 +139,9 @@ def main():
username=configs.username, username=configs.username,
ansible_ssh_user=configs.ansible_ssh_user, ansible_ssh_user=configs.ansible_ssh_user,
plan_name=configs.stack or configs.plan, plan_name=configs.stack or configs.plan,
ansible_python_interpreter=configs.ansible_python_interpreter) ansible_python_interpreter=configs.ansible_python_interpreter,
undercloud_key_file=configs.undercloud_key_file,
host_network=configs.ssh_network)
if configs.list: if configs.list:
try: try: