From 14aa370958777eba2a5b8b19ffc7cc4be270ba6c 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: I76da85cef53e4f8775bddb49de4b12349d85e56b --- tests/group_vars/all_containers.yml | 1 - tests/host_vars/barbican1.yml | 1 + tests/host_vars/infra1.yml | 1 + tests/host_vars/keystone1.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 9710edf..c1443f0 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/barbican1.yml b/tests/host_vars/barbican1.yml index 0e876f6..0d0c5a3 100644 --- a/tests/host_vars/barbican1.yml +++ b/tests/host_vars/barbican1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.0.4 ansible_become: True ansible_user: root +container_name: barbican1 diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml index 86d45ff..fcf92eb 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/keystone1.yml b/tests/host_vars/keystone1.yml index 23b9498..df880b8 100644 --- a/tests/host_vars/keystone1.yml +++ b/tests/host_vars/keystone1.yml @@ -16,3 +16,4 @@ ansible_host: 10.1.0.3 ansible_become: True ansible_user: root +container_name: keystone1