--- a/components/openstack/nova/files/nova-compute.xml	Tue Nov 08 04:33:35 2016 -0800
+++ b/components/openstack/nova/files/nova-compute.xml	Tue Nov 08 11:16:49 2016 -0700
@@ -66,7 +66,10 @@
         <method_credential user='nova' group='nova' />
       </method_context>
     </exec_method>
-    <exec_method timeout_seconds="60" type="method" name="stop"
+    <!-- increase the timeout to 600 seconds. The time that it could take to
+	 flush the database calls and complete shutdown espescially on heavily
+	 utilized systems. -->
+    <exec_method timeout_seconds="600" type="method" name="stop"
       exec=":kill"/>
 
     <instance name='default' enabled='false'>