add configurable timeouts for DB sync
This patch integrates with the db_sync_timeout parameter recently added to puppet-nova and puppet-neutron in I6b30a4d9e3ca25d9a473e4eb614a8769fa4567e7, which allow for the full db_sync install to have more time than just Pupppet's default of 300 seconds. Ultimately, similar timeouts can be added for all other projects that feature db sync phases, however Nova and Neutron are currently the ones that are known to time out in some environments. Closes-bug: #1661100 Change-Id: Ic47439a0a774e3d74e844d43b58956da8d1887da
This commit is contained in:
parent
f68111bd9e
commit
a87b5630ba
@ -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
|
||||
|
@ -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}
|
||||
|
@ -0,0 +1,3 @@
|
||||
---
|
||||
features:
|
||||
- Adds DatabaseSyncTimeout parameter to Nova and Neutron templates.
|
Loading…
Reference in New Issue
Block a user