From 0737337ee4d37330ee10a0149279434f2ae87125 Mon Sep 17 00:00:00 2001 From: Andy McCrae Date: Thu, 15 Sep 2016 10:33:00 +0100 Subject: [PATCH] Add "ansible_host" to each host Changes to the lxc_container_create role caused the swift tests to begin failing. The "Wait for ssh to be available" task requires an "ansible_host" value, which was not set for the Swift test containers, as a result this task continuously failed despite the containers being up and accessible. Change-Id: I69e8f9bbc0c0a69a24b4a4143c806ea10779f0b0 --- tests/host_vars/infra1.yml | 1 + tests/host_vars/infraA1.yml | 1 + tests/host_vars/infraB1.yml | 1 + tests/host_vars/swift-proxy.yml | 1 + tests/host_vars/swift-proxyA.yml | 1 + tests/host_vars/swift-proxyB.yml | 1 + tests/host_vars/swift-storage1.yml | 1 + tests/host_vars/swift-storage2.yml | 1 + tests/host_vars/swift-storage3.yml | 1 + tests/host_vars/swift-storage4.yml | 1 + tests/host_vars/swift-storageA1.yml | 1 + tests/host_vars/swift-storageA2.yml | 1 + tests/host_vars/swift-storageB1.yml | 1 + tests/host_vars/swift-storageB2.yml | 1 + 14 files changed, 14 insertions(+) diff --git a/tests/host_vars/infra1.yml b/tests/host_vars/infra1.yml index 0fcdabb9..cb00fb61 100644 --- a/tests/host_vars/infra1.yml +++ b/tests/host_vars/infra1.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.101 +ansible_host: 10.1.1.101 container_networks: management_address: address: "{{ ansible_ssh_host }}" diff --git a/tests/host_vars/infraA1.yml b/tests/host_vars/infraA1.yml index aefd6155..e561a125 100644 --- a/tests/host_vars/infraA1.yml +++ b/tests/host_vars/infraA1.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.101 +ansible_host: 10.1.1.101 container_networks: management_address: address: "{{ ansible_ssh_host }}" diff --git a/tests/host_vars/infraB1.yml b/tests/host_vars/infraB1.yml index a785b42a..b6c91038 100644 --- a/tests/host_vars/infraB1.yml +++ b/tests/host_vars/infraB1.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.11.101 +ansible_host: 10.1.11.101 container_networks: management_address: address: "{{ ansible_ssh_host }}" diff --git a/tests/host_vars/swift-proxy.yml b/tests/host_vars/swift-proxy.yml index 0cd1e6e8..c714d2e7 100644 --- a/tests/host_vars/swift-proxy.yml +++ b/tests/host_vars/swift-proxy.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.102 +ansible_host: 10.1.1.102 storage_address: 10.1.2.102 container_networks: management_address: diff --git a/tests/host_vars/swift-proxyA.yml b/tests/host_vars/swift-proxyA.yml index b9311cbb..c38a51ae 100644 --- a/tests/host_vars/swift-proxyA.yml +++ b/tests/host_vars/swift-proxyA.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.102 +ansible_host: 10.1.1.102 storage_address: 10.1.2.102 container_networks: management_address: diff --git a/tests/host_vars/swift-proxyB.yml b/tests/host_vars/swift-proxyB.yml index 77ee23f8..fb09c516 100644 --- a/tests/host_vars/swift-proxyB.yml +++ b/tests/host_vars/swift-proxyB.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.11.102 +ansible_host: 10.1.11.102 storage_address: 10.1.12.102 container_networks: management_address: diff --git a/tests/host_vars/swift-storage1.yml b/tests/host_vars/swift-storage1.yml index 168eef5c..41de976d 100644 --- a/tests/host_vars/swift-storage1.yml +++ b/tests/host_vars/swift-storage1.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.103 +ansible_host: 10.1.1.103 storage_address: 10.1.2.103 replication_address: 10.1.3.103 container_networks: diff --git a/tests/host_vars/swift-storage2.yml b/tests/host_vars/swift-storage2.yml index 5d4528ae..f1adc381 100644 --- a/tests/host_vars/swift-storage2.yml +++ b/tests/host_vars/swift-storage2.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.104 +ansible_host: 10.1.1.104 storage_address: 10.1.2.104 replication_address: 10.1.3.104 container_networks: diff --git a/tests/host_vars/swift-storage3.yml b/tests/host_vars/swift-storage3.yml index 9c292022..2e626c69 100644 --- a/tests/host_vars/swift-storage3.yml +++ b/tests/host_vars/swift-storage3.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.105 +ansible_host: 10.1.1.105 storage_address: 10.1.2.105 replication_address: 10.1.3.105 container_networks: diff --git a/tests/host_vars/swift-storage4.yml b/tests/host_vars/swift-storage4.yml index b794fef7..4252f1f1 100644 --- a/tests/host_vars/swift-storage4.yml +++ b/tests/host_vars/swift-storage4.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.106 +ansible_host: 10.1.1.106 storage_address: 10.1.2.106 replication_address: 10.1.3.106 container_networks: diff --git a/tests/host_vars/swift-storageA1.yml b/tests/host_vars/swift-storageA1.yml index 7cd911eb..19b31917 100644 --- a/tests/host_vars/swift-storageA1.yml +++ b/tests/host_vars/swift-storageA1.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.103 +ansible_host: 10.1.1.103 storage_address: 10.1.2.103 replication_address: 10.1.3.103 container_networks: diff --git a/tests/host_vars/swift-storageA2.yml b/tests/host_vars/swift-storageA2.yml index bbd76fba..1c41dc60 100644 --- a/tests/host_vars/swift-storageA2.yml +++ b/tests/host_vars/swift-storageA2.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.1.104 +ansible_host: 10.1.1.104 storage_address: 10.1.2.104 replication_address: 10.1.3.104 container_networks: diff --git a/tests/host_vars/swift-storageB1.yml b/tests/host_vars/swift-storageB1.yml index 5953ae7f..cdf8e8ed 100644 --- a/tests/host_vars/swift-storageB1.yml +++ b/tests/host_vars/swift-storageB1.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.11.103 +ansible_host: 10.1.11.103 storage_address: 10.1.12.103 replication_address: 10.1.13.103 container_networks: diff --git a/tests/host_vars/swift-storageB2.yml b/tests/host_vars/swift-storageB2.yml index 4cd642ca..71c37458 100644 --- a/tests/host_vars/swift-storageB2.yml +++ b/tests/host_vars/swift-storageB2.yml @@ -14,6 +14,7 @@ # limitations under the License. ansible_ssh_host: 10.1.11.104 +ansible_host: 10.1.11.104 storage_address: 10.1.12.104 replication_address: 10.1.13.104 container_networks: