From 60a1889001fd3c7b94f5bec0e8feb6fd16d0ee30 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Tue, 25 Oct 2016 14:37:45 -0500 Subject: [PATCH] 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: Icd0874e88d7d2d8c14d568256e6fd59951b95858 Related-Bug: #1636606 Signed-off-by: Kevin Carter --- tests/group_vars/all_containers.yml | 2 +- tests/inventory | 4 ++-- tests/os_rally-overrides.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index 4cc9794..d644759 100644 --- a/tests/group_vars/all_containers.yml +++ b/tests/group_vars/all_containers.yml @@ -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: diff --git a/tests/inventory b/tests/inventory index 7f07520..b2be94e 100644 --- a/tests/inventory +++ b/tests/inventory @@ -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] infra1 diff --git a/tests/os_rally-overrides.yml b/tests/os_rally-overrides.yml index 17eaf03..2372350 100644 --- a/tests/os_rally-overrides.yml +++ b/tests/os_rally-overrides.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -rally_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_ssh_host'] }}" +rally_galera_address: "{{ hostvars[groups['galera_all'][0]]['ansible_host'] }}" rally_galera_database: rally rally_galera_password: "SuperSecrete" rally_venv_tag: "testing"