summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJimmy McCrory <jimmy.mccrory@gmail.com>2018-10-20 15:28:29 -0700
committerJimmy McCrory <jimmy.mccrory@gmail.com>2018-10-20 15:28:29 -0700
commit934727a3e05db6dacb656a461fe9be9054c3a753 (patch)
tree3217de54c8febdfadd140cbece1607be3ff0dd36
parent56735531628aa668e53f0f24ff8f51197a93befd (diff)
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: If2a401e444df982c3cd79a3f2d591438f3582c2a
Notes
Notes (review): Code-Review+2: Mohammed Naser <mnaser@vexxhost.com> Workflow+1: Mohammed Naser <mnaser@vexxhost.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sun, 21 Oct 2018 16:38:38 +0000 Reviewed-on: https://review.openstack.org/612078 Project: openstack/openstack-ansible-os_congress Branch: refs/heads/master
-rw-r--r--tests/group_vars/all_containers.yml1
-rw-r--r--tests/host_vars/congress1.yml1
-rw-r--r--tests/host_vars/infra1.yml1
-rw-r--r--tests/host_vars/openstack1.yml1
4 files changed, 3 insertions, 1 deletions
diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml
index 6d5b77b..c96647b 100644
--- a/tests/group_vars/all_containers.yml
+++ b/tests/group_vars/all_containers.yml
@@ -13,7 +13,6 @@
13# See the License for the specific language governing permissions and 13# See the License for the specific language governing permissions and
14# limitations under the License. 14# limitations under the License.
15 15
16container_name: "{{ inventory_hostname }}"
17container_networks: 16container_networks:
18 management_address: 17 management_address:
19 address: "{{ ansible_host }}" 18 address: "{{ ansible_host }}"
diff --git a/tests/host_vars/congress1.yml b/tests/host_vars/congress1.yml
index ddbf35e..476410f 100644
--- a/tests/host_vars/congress1.yml
+++ b/tests/host_vars/congress1.yml
@@ -16,3 +16,4 @@
16ansible_host: 10.1.0.4 16ansible_host: 10.1.0.4
17ansible_become: True 17ansible_become: True
18ansible_user: root 18ansible_user: root
19container_name: congress1
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 @@
16ansible_host: 10.1.0.2 16ansible_host: 10.1.0.2
17ansible_become: True 17ansible_become: True
18ansible_user: root 18ansible_user: root
19container_name: infra1
diff --git a/tests/host_vars/openstack1.yml b/tests/host_vars/openstack1.yml
index 1f4bcf0..de4e703 100644
--- a/tests/host_vars/openstack1.yml
+++ b/tests/host_vars/openstack1.yml
@@ -16,3 +16,4 @@
16ansible_host: 10.1.0.3 16ansible_host: 10.1.0.3
17ansible_become: True 17ansible_become: True
18ansible_user: root 18ansible_user: root
19container_name: openstack1