From 3f38edbf3296493bfa2da643d56cf61f48832b44 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: Ib1bac8c596e97505e537095474aa9aca208eea41 --- tests/group_vars/all_containers.yml | 1 - tests/host_vars/container1.yml | 1 + tests/host_vars/container2.yml | 1 + tests/host_vars/container3.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 a4af7376..6d158b67 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/container1.yml b/tests/host_vars/container1.yml index a6db6ae6..893afad4 100644 --- a/tests/host_vars/container1.yml +++ b/tests/host_vars/container1.yml @@ -2,3 +2,4 @@ ansible_host: 10.1.0.2 ansible_become: True ansible_user: root +container_name: container1 diff --git a/tests/host_vars/container2.yml b/tests/host_vars/container2.yml index 916ed80d..ae79a180 100644 --- a/tests/host_vars/container2.yml +++ b/tests/host_vars/container2.yml @@ -2,3 +2,4 @@ ansible_host: 10.1.0.3 ansible_become: True ansible_user: root +container_name: container2 diff --git a/tests/host_vars/container3.yml b/tests/host_vars/container3.yml index af4ff9f2..a8bfb0d2 100644 --- a/tests/host_vars/container3.yml +++ b/tests/host_vars/container3.yml @@ -2,3 +2,4 @@ ansible_host: 10.1.0.4 ansible_become: True ansible_user: root +container_name: container3