summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-20 10:19:28 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-05-20 10:41:47 -0400
commit5390499e692a3a12a60507e359384c44b1ea6784 (patch)
treef6cd026b40e24ac43713d6226ba4e74e8d2bbbd3 /puppet/controller-puppet.yaml
parent43d4eee72884c23de2aef76436ba2044afdb80e8 (diff)
Use clustercheck script to control galera-ready
The exec timeout/attempts is configured so that it is left running for up to 30mins if the command runs but is unsuccessfull and up to 2h if the command times out. Change-Id: I4b6b77e878017bf92d7c59c868d393e74405a355
Diffstat (limited to 'puppet/controller-puppet.yaml')
-rw-r--r--puppet/controller-puppet.yaml6
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index af1ee6fd..e13b66ae 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -226,10 +226,6 @@ parameters:
type: string
hidden: true
default: '' # Has to be here because of the ignored empty value bug
- MysqlClustercheckPassword:
- type: string
- hidden: true
- default: '' # Has to be here because of the ignored empty value bug
NeutronBridgeMappings:
description: >
The OVS logical->physical bridge mappings to use. See the Neutron
@@ -556,7 +552,6 @@ resources:
enable_swift_storage: {get_param: EnableSwiftStorage}
mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
mysql_root_password: {get_param: MysqlRootPassword}
- mysql_clustercheck_password: {get_param: MysqlClustercheckPassword}
mysql_cluster_name:
str_replace:
template: tripleo-CLUSTER
@@ -771,7 +766,6 @@ resources:
mysql_innodb_buffer_pool_size: {get_input: mysql_innodb_buffer_pool_size}
mysql::server::root_password: {get_input: mysql_root_password}
mysql_cluster_name: {get_input: mysql_cluster_name}
- mysql_clustercheck_password: {get_input: mysql_clustercheck_password}
# Neutron
neutron::bind_host: {get_input: controller_host}