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: If28f2586017c3813afd4260533c16e4390cebc04

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 }}"
 physical_host: localhost
 properties:
   service_name: "{{ inventory_hostname }}"

tests/host_vars/infra1.yml

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 ansible_host: 10.1.1.101
+container_name: infra1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"

tests/host_vars/swift-proxy.yml

@@ -15,6 +15,7 @@
 
 ansible_host: 10.1.1.102
 storage_address: 10.1.2.102
+container_name: swift-proxy
 container_networks:
   management_address:
     address: "{{ ansible_host }}"

tests/host_vars/swift-storage1.yml

@@ -18,6 +18,7 @@
 ansible_host: 10.1.1.103
 swift_storage_address: 10.1.2.103
 swift_replication_address: 10.1.3.103
+container_name: swift-storage1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"

tests/host_vars/swift-storage2.yml

@@ -16,6 +16,7 @@
 ansible_host: 10.1.1.104
 storage_address: 10.1.2.104
 replication_address: 10.1.3.104
+container_name: swift-storage2
 container_networks:
   management_address:
     address: "{{ ansible_host }}"

tests/host_vars/swift-storage3.yml

@@ -20,6 +20,7 @@ swift_vars:
   storage_ip: 10.1.2.105
 
 ansible_host: 10.1.1.105
+container_name: swift-storage3
 container_networks:
   management_address:
     address: "{{ ansible_host }}"