openstack/openstack-ansible
Code Issues Proposed changes

Merge "Move ansible_ssh_host to ansible_host"

Browse Source
This commit is contained in:
Jenkins 2016-11-10 16:29:49 +00:00 committed by Gerrit Code Review
commit 3d1171abef
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/openstack_deploy/conf.d/swift-remote.yml.sample
View File

@ -2,7 +2,7 @@
# For remote swift hosts you will only specify the IP address
# NB. The ip address that must be specified is the IP address that swift
# hosts will be able to replicate on and not necessarily the
# ansible_ssh_host IP from the remote ansible install.
# ansible_ssh IP from the remote ansible install.
swift-remote_hosts:
remote-swift1:
ip: 172.29.237.1

2
lib/manage.py
View File

@ -249,7 +249,7 @@ def print_inventory(inventory, sort_key):
'component',
'physical_host',
'tunnel_address',
'ansible_ssh_host',
'ansible_host',
'container_types'
]
table = prettytable.PrettyTable(required_list)

2
scripts/upgrade-utilities/playbooks/galera-cluster-rolling-restart.yml
View File

@ -44,7 +44,7 @@
local_action:
module: wait_for
port: "3306"
host: "{{ ansible_ssh_host | default(inventory_hostname) }}"
host: "{{ ansible_host | default(ansible_ssh_host | default(inventory_hostname)) }}"
retries: 10
delay: 10