From a8bd55beabf22cd8d45ab6e33b9493b3f26cabd0 Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Mon, 22 Oct 2018 12:17:15 +0100 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: Ic3975acc1d7fa608d67b3e2171b0d862fb2b28fd --- tests/group_vars/all_containers.yml | 1 - tests/host_vars/blazar1.yml | 1 + tests/host_vars/infra1.yml | 1 + tests/host_vars/openstack1.yml | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index c1e9cf0..ab2319c 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/blazar1.yml b/tests/host_vars/blazar1.yml index 60495bb..91cedbe 100644 --- a/tests/host_vars/blazar1.yml +++ b/tests/host_vars/blazar1.yml @@ -17,3 +17,4 @@ ansible_host: 10.1.1.103 ansible_become: True ansible_user: root tunnel_address: 10.1.2.103 +container_name: blazar1 diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml index 15318d8..3a1379b 100644 --- a/tests/host_vars/infra1.yml +++ b/tests/host_vars/infra1.yml @@ -17,3 +17,4 @@ ansible_host: 10.1.1.101 ansible_become: True ansible_user: root tunnel_address: 10.1.2.101 +container_name: infra1 diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml index 4302553..e2f981e 100644 --- a/tests/host_vars/openstack1.yml +++ b/tests/host_vars/openstack1.yml @@ -18,3 +18,4 @@ ansible_become: True ansible_user: root tunnel_address: 10.1.2.102 neutron_local_ip: 10.1.2.102 +container_name: openstack1