From 15417480bf0fda5ca80c9b24955afef002629374 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: I5f7b222d92765dc7aaac8dfc83b4c05e160a3126 --- 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 cd06d751..f1960dc6 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 86d45ff8..fcf92ebc 100644 --- a/tests/host_vars/infra1.yml +++ b/tests/host_vars/infra1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.0.2 ansible_become: True ansible_user: root +container_name: infra1 diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml index 23b94986..0290962f 100644 --- a/tests/host_vars/openstack1.yml +++ b/tests/host_vars/openstack1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.0.3 ansible_become: True ansible_user: root +container_name: openstack1