--- a/components/openstack/nova/files/nova-conductor.xml	Thu Jun 11 22:21:17 2015 -0700
+++ b/components/openstack/nova/files/nova-conductor.xml	Fri Jun 12 06:12:26 2015 -0700
@@ -53,7 +53,7 @@
 
     <logfile_attributes permissions='600'/>
 
-    <exec_method timeout_seconds="60" type="method" name="start"
+    <exec_method timeout_seconds="600" type="method" name="start"
       exec="/lib/svc/method/nova-conductor %m">
       <method_context>
         <method_credential user='nova' group='nova' />