aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-22 20:05:51 +0000
committerGerrit Code Review <review@openstack.org>2015-04-22 20:05:51 +0000
commit1781c64bfc9cc929355b28344d0e34b2347e6ffe (patch)
treef07d26d15938eb17c7f29140bbc1737a540e6a23
parent9a1c402343a73e9442768e1864ed6a36c9bca3f6 (diff)
parent1f7426a014f0f83ace4d2b3531014e22f7778b4d (diff)
Merge "Set EnablePacemaker == false be default"
-rw-r--r--controller.yaml2
-rw-r--r--overcloud-without-mergepy.yaml2
-rw-r--r--puppet/controller-puppet.yaml2
3 files changed, 3 insertions, 3 deletions
diff --git a/controller.yaml b/controller.yaml
index ef3f8bed..483ecc8f 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -68,7 +68,7 @@ parameters:
description: Whether to use Galera instead of regular MariaDB.
type: boolean
EnablePacemaker:
- default: true
+ default: false
description: If enabled services will be monitored by Pacemaker; it
will manage VIPs as well, in place of Keepalived.
type: boolean
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index f661d04c..142e502e 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -264,7 +264,7 @@ parameters:
description: Whether to use Galera instead of regular MariaDB.
type: boolean
EnablePacemaker:
- default: true
+ default: false
description: If enabled services will be monitored by Pacemaker; it
will manage VIPs as well, in place of Keepalived.
type: boolean
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index b8aabe63..d3955467 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -68,7 +68,7 @@ parameters:
description: Whether to use Galera instead of regular MariaDB.
type: boolean
EnablePacemaker:
- default: true
+ default: false
description: If enabled services will be monitored by Pacemaker; it
will manage VIPs as well, in place of Keepalived.
type: boolean