From be4dbb777033ecaeaf045feb5c4ce2b232514e8d Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Sat, 20 Oct 2018 12:02:50 -0700 Subject: [PATCH] Set container_name as host_var in test inventory The connection plugin no longer falls back on using the inventory_hostname as the container_name. Set container_name as a host var for each container in the test inventory. Change-Id: I9d2ce4a0554a791bd6dea0e7280205b0d71c8fd6 --- tests/group_vars/all_containers.yml | 1 - tests/host_vars/infra1.yml | 1 + tests/host_vars/openstack1.yml | 1 + 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index 2245b745..0a2006ed 100644 --- a/tests/group_vars/all_containers.yml +++ b/tests/group_vars/all_containers.yml @@ -13,7 +13,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -container_name: "{{ inventory_hostname }}" container_networks: management_address: address: "{{ ansible_host }}" diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml index 15318d86..5d137425 100644 --- a/tests/host_vars/infra1.yml +++ b/tests/host_vars/infra1.yml @@ -16,4 +16,5 @@ ansible_host: 10.1.1.101 ansible_become: True ansible_user: root +container_name: infra1 tunnel_address: 10.1.2.101 diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml index e08a3c7a..86dc31fd 100644 --- a/tests/host_vars/openstack1.yml +++ b/tests/host_vars/openstack1.yml @@ -20,5 +20,6 @@ neutron_provider_networks: ansible_host: 10.1.1.102 ansible_become: True ansible_user: root +container_name: openstack1 tunnel_address: 10.1.2.102 neutron_local_ip: 10.1.2.102