# HG changeset patch
# User Drew Fisher <drew.fisher@oracle.com>
# Date 1434114746 25200
# Node ID a2c8214e9a7fdad8132b8783115d5a9a48e4a37d
# Parent  e820ffee94f1b34db732f33c2ff05b8041bf6d29
21209844 heat-db method timeout is too short, can cause corruption on upgrade

diff -r e820ffee94f1 -r a2c8214e9a7f components/openstack/cinder/files/cinder-db.xml
--- a/components/openstack/cinder/files/cinder-db.xml	Thu Jun 11 22:21:17 2015 -0700
+++ b/components/openstack/cinder/files/cinder-db.xml	Fri Jun 12 06:12:26 2015 -0700
@@ -48,7 +48,7 @@
 
     <logfile_attributes permissions='600'/>
 
-    <exec_method timeout_seconds="60" type="method" name="start"
+    <exec_method timeout_seconds="600" type="method" name="start"
       exec="/usr/bin/cinder-manage db sync">
       <method_context>
         <method_credential user='cinder' group='cinder' />
diff -r e820ffee94f1 -r a2c8214e9a7f components/openstack/glance/files/glance-db.xml
--- a/components/openstack/glance/files/glance-db.xml	Thu Jun 11 22:21:17 2015 -0700
+++ b/components/openstack/glance/files/glance-db.xml	Fri Jun 12 06:12:26 2015 -0700
@@ -47,7 +47,7 @@
 
     <logfile_attributes permissions='600'/>
 
-    <exec_method timeout_seconds="60" type="method" name="start"
+    <exec_method timeout_seconds="600" type="method" name="start"
       exec="/usr/bin/glance-manage db_sync">
       <method_context>
         <method_credential user='glance' group='glance' />
diff -r e820ffee94f1 -r a2c8214e9a7f components/openstack/heat/files/heat-db.xml
--- a/components/openstack/heat/files/heat-db.xml	Thu Jun 11 22:21:17 2015 -0700
+++ b/components/openstack/heat/files/heat-db.xml	Fri Jun 12 06:12:26 2015 -0700
@@ -46,7 +46,7 @@
 
     <logfile_attributes permissions='600'/>
 
-    <exec_method timeout_seconds="60" type="method" name="start"
+    <exec_method timeout_seconds="600" type="method" name="start"
       exec="/usr/bin/heat-manage db_sync">
       <method_context>
         <method_credential user='heat' group='heat' />
diff -r e820ffee94f1 -r a2c8214e9a7f components/openstack/keystone/files/keystone.xml
--- a/components/openstack/keystone/files/keystone.xml	Thu Jun 11 22:21:17 2015 -0700
+++ b/components/openstack/keystone/files/keystone.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/keystone %m">
       <method_context>
         <method_credential user='keystone' group='keystone' />
diff -r e820ffee94f1 -r a2c8214e9a7f components/openstack/neutron/files/neutron-server.xml
--- a/components/openstack/neutron/files/neutron-server.xml	Thu Jun 11 22:21:17 2015 -0700
+++ b/components/openstack/neutron/files/neutron-server.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/neutron-server %m %{config/config_path} %{config/plugin_config_path}">
       <method_context>
         <method_credential user='neutron' group='neutron' />
diff -r e820ffee94f1 -r a2c8214e9a7f components/openstack/nova/files/nova-conductor.xml
--- 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' />