openstack
/
tripleo-validations
Code Issues Proposed changes

Merge "Set undercloud-connection to local by default" into stable/stein

This commit is contained in:
Zuul 2019-08-30 04:59:19 +00:00 committed by Gerrit Code Review
parent e62b8ee878 4c795bb434
commit 585c119c84
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/tripleo-ansible-inventory
View File

@ -54,7 +54,8 @@ opts = [
'will take precedence.')), 'will take precedence.')),
cfg.StrOpt('ansible_ssh_user', default=os.environ.get('ANSIBLE_SSH_USER', cfg.StrOpt('ansible_ssh_user', default=os.environ.get('ANSIBLE_SSH_USER',
'heat-admin')), 'heat-admin')),
cfg.StrOpt('undercloud-connection', default=inv.UNDERCLOUD_CONNECTION_SSH, cfg.StrOpt('undercloud-connection',
default=inv.UNDERCLOUD_CONNECTION_LOCAL,
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('undercloud-key-file', default=None),