summaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker/neutron/plugins/ml2.pp
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2016-07-13 16:30:45 -0400
committerMichele Baldessari <michele@acksyn.org>2016-07-18 21:45:25 +0200
commit5927148c4b5813180204c2983b5c95b69a2ad265 (patch)
treefd901117f33fe45e5e988c3de3432268548080e9 /manifests/profile/pacemaker/neutron/plugins/ml2.pp
parent4f0582ea40b6d1d2330bfd7683ab40852ed09403 (diff)
Make ::tripleo::profile::base classes work with multiple nodes
In the Next Generation HA architecture a number of active/active services will be run via systemd. In order for this to work we need to make sure that the sync_db operation only takes place on the bootstrap node, just like it is done today for the pacemaker profiles. We do this by removing sync_db as a parameter and instead set it to true or false depending if the hostname matches the bootstrap_node as it is done today in the pacemaker role. Note that we call hiera('bootstrap_nodeid', undef) because if a profile is included on a non controller node that variable will be undefined. The following testing was done: - HA puppet-pacemaker.yaml scenario with three computes - NonHA with one controller - NonHA with three controllers Fixes-Bug: 1600149 Co-Author: cmsj@tenshu.net Change-Id: I04a7b9e3c18627ea512000a34357acb7f27d6e0e Implements: blueprint ha-lightweight-architecture
Diffstat (limited to 'manifests/profile/pacemaker/neutron/plugins/ml2.pp')
-rw-r--r--manifests/profile/pacemaker/neutron/plugins/ml2.pp13
1 files changed, 3 insertions, 10 deletions
diff --git a/manifests/profile/pacemaker/neutron/plugins/ml2.pp b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
index 6c9d8b1..e5e13b7 100644
--- a/manifests/profile/pacemaker/neutron/plugins/ml2.pp
+++ b/manifests/profile/pacemaker/neutron/plugins/ml2.pp
@@ -18,19 +18,12 @@
#
# === Parameters
#
-# [*pacemaker_master*]
-# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid', undef)
-#
-class tripleo::profile::pacemaker::neutron::plugins::ml2 (
- $pacemaker_master = hiera('bootstrap_nodeid', undef),
-) {
+class tripleo::profile::pacemaker::neutron::plugins::ml2
+{
include ::neutron::params
include ::tripleo::profile::pacemaker::neutron
- class { '::tripleo::profile::base::neutron::plugins::ml2':
- sync_db => ($::hostname == downcase($pacemaker_master))
- }
+ include ::tripleo::profile::base::neutron::plugins::ml2
}