Fix naming of external services (e.g. specified by rancher.services_include)

Add container_name key to service configuration.

tests/integration/assets/test_01/cloud-config.yml

@@ -3,6 +3,8 @@ rancher:
   environment:
     ETCD_DISCOVERY: https://discovery.etcd.io/c2c219023108cda9529364d6d983fe13
     FLANNEL_NETWORK: 10.244.0.0/16
+  services_include:
+    kernel-headers: true
   network:
     interfaces:
       eth1:

tests/integration/rostest/test_01_cloud_config.py

@@ -63,6 +63,11 @@ def test_dhcpcd(qemu, cloud_config):
     assert v.find('dhcpcd -M') != -1
 
 
+@pytest.mark.timeout(40)
+def test_services_include(qemu, cloud_config):
+    u.wait_for_ssh(qemu, ssh_command, ['docker inspect kernel-headers >/dev/null 2>&1'])
+
+
 @pytest.mark.timeout(40)
 def test_docker_tls_args(qemu, cloud_config):
     u.wait_for_ssh(qemu, ssh_command)

tests/integration/rostest/util.py

@@ -76,11 +76,11 @@ def flush_out(stdout, substr='RancherOS '):
 
 
 @pytest.mark.timeout(10)
-def wait_for_ssh(qemu, ssh_command=['./scripts/ssh', '--qemu']):
+def wait_for_ssh(qemu, ssh_command=['./scripts/ssh', '--qemu'], command=['docker version >/dev/null 2>&1']):
     i = 0
     assert qemu.returncode is None
     print('\nWaiting for ssh and docker... ' + str(i))
-    while subprocess.call(ssh_command + ['docker version >/dev/null 2>&1']) != 0:
+    while subprocess.call(ssh_command + command) != 0:
         i += 1
         print('\nWaiting for ssh and docker... ' + str(i))
         time.sleep(1)