summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2015-09-11 10:05:00 +0100
committerMichael Drake <michael.drake@codethink.co.uk>2015-09-11 15:01:23 +0100
commit120e05f78915f29c559b1b5caf3cab2dd022dc87 (patch)
tree2aca32d1480624bb3f8511c5efa9001281f41111
parentde7f51137cd7417048713dcd6615bdb9ee870eeb (diff)
downloadciat-tester-120e05f78915f29c559b1b5caf3cab2dd022dc87.tar.gz
Disable cloud-init; no need for it yet, and it fails.
-rwxr-xr-xopenstack/tester4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/tester b/openstack/tester
index 4c3932a..f26ee59 100755
--- a/openstack/tester
+++ b/openstack/tester
@@ -238,7 +238,7 @@ class DeployedSystemInstance(object):
def wait_until_online(self, timeout=120):
self._wait_for_dhcp(timeout)
self._wait_for_ssh(timeout)
- self._wait_for_cloud_init(timeout)
+ #self._wait_for_cloud_init(timeout)
print "Test system %s ready to run tests." % (self.hostname)
def delete(self):
@@ -356,7 +356,7 @@ class Deployment(object):
args = ['nova', 'boot',
'--flavor', 'm1.medium',
'--image', hostname,
- '--user-data', '/usr/lib/mason/os-init-script',
+ #'--user-data', '/usr/lib/mason/os-init-script',
'--nic', "net-id=%s" % (self.net_id),
hostname]
output = cliapp.runcmd(args)