openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Allow the override of pacemaker::corosync::settle_tries" into stable/mitaka

This commit is contained in:
Jenkins 2017-02-16 19:14:46 +00:00 committed by Gerrit Code Review
parent 496828aa53 1b1a64feab
commit bf86ef72db
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
puppet/controller.yaml
View File

@ -124,6 +124,12 @@ parameters:
default: 'br-ex'
description: Interface where virtual ip will be assigned.
type: string
CorosyncSettleTries:
type: number
description: Number of tries for cluster settling. This has the
same default as the pacemaker puppet module. Override
to a smaller value when in need to replace a controller node.
default: 360
CorosyncIPv6:
default: false
description: Enable IPv6 in Corosync
@ -1277,6 +1283,7 @@ resources:
nova_enable_db_purge: {get_param: NovaEnableDBPurge}
nova_ipv6: {get_param: NovaIPv6}
corosync_ipv6: {get_param: CorosyncIPv6}
corosync_settle_tries: {get_param: CorosyncSettleTries}
memcached_ipv6: {get_param: MemcachedIPv6}
nova_password: {get_param: NovaPassword}
nova_dsn:
@ -1432,6 +1439,7 @@ resources:
enable_load_balancer: {get_input: enable_load_balancer}
hacluster_pwd: {get_input: pcsd_password}
corosync_ipv6: {get_input: corosync_ipv6}
pacemaker::corosync::settle_tries: {get_input: corosync_settle_tries}
tripleo::fencing::config: {get_input: fencing_config}
# Swift