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: I9ab81228a29133e7f50629db3b604eeab6bedf5a
(cherry picked from commit 441c8b6b819b85b81989499bffda09a04e2ec612)

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

@@ -16,6 +16,7 @@
 ansible_host: 10.1.1.101
 ansible_become: True
 ansible_user: root
+container_name: infra1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"

tests/host_vars/octavia1.yml

@@ -16,6 +16,7 @@
 ansible_host: 10.1.1.104
 ansible_become: True
 ansible_user: root
+container_name: octavia1
 lbaas_address: 10.1.7.104
 container_networks:
   management_address:

tests/host_vars/openstack1.yml

@@ -19,7 +19,7 @@ ansible_user: root
 tunnel_address: 10.1.2.102
 neutron_local_ip: 10.1.2.102
 storage_address: 10.1.5.102
-container_name: "{{ inventory_hostname }}"
+container_name: openstack1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"

tests/host_vars/swift-storage1.yml

@@ -17,6 +17,7 @@ ansible_host: 10.1.1.103
 storage_address: 10.1.5.103
 ansible_user: root
 ansible_become: True
+container_name: swift-storage1
 container_networks:
   management_address:
     address: "{{ ansible_host }}"