Merge "add configurable timeouts for DB sync"

puppet/services/neutron-base.yaml

@@ -22,6 +22,10 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
+  DatabaseSyncTimeout:
+    default: 300
+    description: DB Sync Timeout default
+    type: number
   NeutronDhcpAgentsPerNetwork:
     type: number
     default: 0
@@ -95,6 +99,7 @@ outputs:
             neutron::host: '%{::fqdn}'
             neutron::db::database_db_max_retries: -1
             neutron::db::database_max_retries: -1
+            neutron::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
             neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}
           - if:
             - dhcp_agents_zero

puppet/services/nova-base.yaml

@@ -52,6 +52,10 @@ parameters:
     default: 5672
     description: Set rabbit subscriber port, change this if using SSL
     type: number
+  DatabaseSyncTimeout:
+    default: 300
+    description: DB Sync Timeout default
+    type: number
   Debug:
     type: string
     default: ''
@@ -198,6 +202,8 @@ outputs:
           nova::network::neutron::neutron_auth_type: 'v3password'
           nova::db::database_db_max_retries: -1
           nova::db::database_max_retries: -1
+          nova::db::sync::db_sync_timeout: {get_param: DatabaseSyncTimeout}
+          nova::db::sync_api::db_sync_timeout: {get_param: DatabaseSyncTimeout}
           nova::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]}
           nova::use_ipv6: {get_param: NovaIPv6}
           nova::network::neutron::neutron_ovs_bridge: {get_param: NovaOVSBridge}

releasenotes/notes/add_db_sync_timeout-c9b2f401cca0b37d.yaml

@@ -0,0 +1,3 @@
+---
+features:
+  - Adds DatabaseSyncTimeout parameter to Nova and Neutron templates.