Remove deprecated ansible_ssh_host variable
This changes 'ansible_ssh_host' to 'ansible_host'. The 'ansible_ssh_host'
variable has been deprecated as noted here: [0].
[0] - http://docs.ansible.com/ansible/intro_inventory.html#hosts-and-groups
Change-Id: If4515f257c9d5e0de21eb16f8faea2c249392d69
Related-Bug: #1636606
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
(cherry picked from commit 37f0f088bb
)
This commit is contained in:
parent
d243340f7e
commit
973262c9ad
|
@ -13,7 +13,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
ansible_ssh_host: "{{ ansible_host }}"
|
||||
ansible_host: "{{ ansible_host }}"
|
||||
container_name: "{{ inventory_hostname }}"
|
||||
container_networks:
|
||||
management_address:
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
[all]
|
||||
localhost ansible_become=True
|
||||
infra1 ansible_ssh_host=10.100.100.2 ansible_host=10.100.100.2 ansible_become=True ansible_user=root
|
||||
openstack1 ansible_ssh_host=10.100.100.3 ansible_host=10.100.100.3 ansible_become=True ansible_user=root
|
||||
infra1 ansible_host=10.100.100.2 ansible_host=10.100.100.2 ansible_become=True ansible_user=root
|
||||
openstack1 ansible_host=10.100.100.3 ansible_host=10.100.100.3 ansible_become=True ansible_user=root
|
||||
|
||||
|
||||
[all_containers]
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
# limitations under the License.
|
||||
|
||||
aodh_container_db_password: "secrete"
|
||||
aodh_db_address: "{{ hostvars[groups['galera_all'][0]]['ansible_ssh_host'] }}"
|
||||
aodh_db_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}"
|
||||
aodh_database_name: aodh
|
||||
aodh_rabbitmq_password: "secrete"
|
||||
aodh_rabbitmq_userid: aodh
|
||||
|
@ -24,9 +24,9 @@ aodh_developer_mode: true
|
|||
aodh_git_install_branch: master
|
||||
aodh_requirements_git_install_branch: master
|
||||
aodh_service_password: "secrete"
|
||||
aodh_service_publicuri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_ssh_host'] }}:{{ aodh_service_port }}"
|
||||
aodh_service_internaluri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_ssh_host'] }}:{{ aodh_service_port }}"
|
||||
aodh_service_adminuri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_ssh_host'] }}:{{ aodh_service_port }}"
|
||||
aodh_service_publicuri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_host'] }}:{{ aodh_service_port }}"
|
||||
aodh_service_internaluri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_host'] }}:{{ aodh_service_port }}"
|
||||
aodh_service_adminuri: "{{ aodh_service_proto }}://{{ hostvars[groups['aodh_all'][0]]['ansible_host'] }}:{{ aodh_service_port }}"
|
||||
|
||||
tempest_bin: "/opt/tempest_{{ tempest_venv_tag }}/bin"
|
||||
tempest_plugins:
|
||||
|
|
Loading…
Reference in New Issue