rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-03 07:44:21 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Add container_name key to service configuration.
This commit is contained in:
Ivan Mikushin
2015-12-17 18:30:16 +05:00
parent 0fc5fcca09
commit f4f59e97cc
5 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/integration/rostest/util.py
View File

@@ -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)