aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-19 15:55:08 +0000
committerGerrit Code Review <review@openstack.org>2015-05-19 15:55:08 +0000
commite4dfaf4ab8295fdcb844b70238aae21a109d5282 (patch)
treed519637bce0d3f8a04681c8b24f53d736c6a288c
parent51a9fc752080e88889be2a9fc33c3c7e2c4c1f1d (diff)
parentaf90796cda5072a25c5ea9c9aeda5dc6e16c3db8 (diff)
Merge "Remove unused enable_pacemaker setting from templates"
-rw-r--r--puppet/controller-puppet.yaml2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 09a26d58..2d174f75 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -552,7 +552,6 @@ resources:
- {get_param: VirtualIP}
- ':5000/v2.0/'
enable_galera: {get_param: EnableGalera}
- enable_pacemaker: {get_param: EnablePacemaker}
enable_ceph_storage: {get_param: EnableCephStorage}
enable_swift_storage: {get_param: EnableSwiftStorage}
mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
@@ -675,7 +674,6 @@ resources:
controller_host: {get_input: controller_host} #local-ipv4
# Pacemaker
- enable_pacemaker: {get_input: enable_pacemaker}
hacluster_pwd: {get_input: pcsd_password}
# Swift