summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-21 11:51:48 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-05-22 13:17:10 +0200
commitcd5ba32311f63fb219e026ed6a96bcefe0fd25ca (patch)
treea553d0a065c68e38b3194bbbfd86065ac6126f6d
parent2c09ad590c05e6fd614f9ea78c43638c2a901930 (diff)
Remove unused EnablePacemaker param from templates
Use of Pacemaker is governed by the resource registry since change Ibefb80d0d8f98404133e4c31cf078d729b64dac3. The param stayed longer in the template to prevent breakage of scripts which could have passed it when launching stack-create, despite it being ignored. This change removes the param entirely. Change-Id: I026ce391319a4306c4b81a15652e3cad470e5cb7 Depends-On: I775724b207c737043a2a418a3ec8ede2cbaa8fa0
-rw-r--r--controller.yaml5
-rw-r--r--overcloud-without-mergepy.yaml6
-rw-r--r--puppet/controller-puppet.yaml5
3 files changed, 0 insertions, 16 deletions
diff --git a/controller.yaml b/controller.yaml
index d5d63cd8..19570734 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -71,11 +71,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
EnableCephStorage:
default: false
description: Whether to deploy Ceph Storage (OSD) on the Controller
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 50176968..f01f41a7 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
@@ -572,7 +567,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}
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index bcbaf56e..b0046457 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -71,11 +71,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
EnableCephStorage:
default: false
description: Whether to deploy Ceph Storage (OSD) on the Controller