aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-without-mergepy.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-06-17 18:36:42 +0000
committerGerrit Code Review <review@openstack.org>2015-06-17 18:36:42 +0000
commit4a5fa7ce111951bd9f240462b22b5a85ce7ac632 (patch)
tree76543afe82f518ca34d18da70a66be42801a1a04 /overcloud-without-mergepy.yaml
parent582c150fcea8b154cc0b23ae689ae23a3e27dd8f (diff)
parentcd5ba32311f63fb219e026ed6a96bcefe0fd25ca (diff)
Merge "Remove unused EnablePacemaker param from templates"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
-rw-r--r--overcloud-without-mergepy.yaml6
1 files changed, 0 insertions, 6 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 97f0bd1f..79d95be0 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -267,11 +267,6 @@ parameters:
default: true
description: Whether to use Galera instead of regular MariaDB.
type: boolean
- EnablePacemaker:
- default: false
- description: If enabled services will be monitored by Pacemaker; it
- will manage VIPs as well, in place of Keepalived.
- type: boolean
ControllerEnableCephStorage:
default: false
description: Whether to deploy Ceph Storage (OSD) on the Controller
@@ -612,7 +607,6 @@ resources:
ControllerExtraConfig: {get_param: controllerExtraConfig}
Debug: {get_param: Debug}
EnableGalera: {get_param: EnableGalera}
- EnablePacemaker: {get_param: EnablePacemaker}
EnableCephStorage: {get_param: ControllerEnableCephStorage}
EnableSwiftStorage: {get_param: ControllerEnableSwiftStorage}
ExtraConfig: {get_param: ExtraConfig}