From 120e05f78915f29c559b1b5caf3cab2dd022dc87 Mon Sep 17 00:00:00 2001
From: Michael Drake <michael.drake@codethink.co.uk>
Date: Fri, 11 Sep 2015 10:05:00 +0100
Subject: Disable cloud-init; no need for it yet, and it fails.

---
 openstack/tester | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'openstack')

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)
-- 
cgit v1.2.1