From 6facffe55078dafd6ab565dce507018dc2a88a00 Mon Sep 17 00:00:00 2001 From: Jimmy McCrory Date: Sat, 20 Oct 2018 15:28:29 -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: I0747d097deea5f6c2556ab660ce9d1f22dd0eeb4 --- tests/group_vars/all_containers.yml | 1 - tests/host_vars/infra1.yml | 1 + tests/host_vars/openstack1.yml | 1 + tests/host_vars/sahara1.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 f37df47..802a50f 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 bfdc135..257556f 100644 --- a/tests/host_vars/infra1.yml +++ b/tests/host_vars/infra1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.1.101 ansible_become: True ansible_user: root +container_name: infra1 diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml index e50c238..29c48ad 100644 --- a/tests/host_vars/openstack1.yml +++ b/tests/host_vars/openstack1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.1.102 ansible_become: True ansible_user: root +container_name: openstack1 diff --git a/tests/host_vars/sahara1.yml b/tests/host_vars/sahara1.yml index 1f172ba..4d0ec62 100644 --- a/tests/host_vars/sahara1.yml +++ b/tests/host_vars/sahara1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.1.103 ansible_become: True ansible_user: root +container_name: sahara1