summaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker/neutron.pp
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/profile/pacemaker/neutron.pp')
-rw-r--r--manifests/profile/pacemaker/neutron.pp8
1 files changed, 3 insertions, 5 deletions
diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp
index 2af53dc..75a75b3 100644
--- a/manifests/profile/pacemaker/neutron.pp
+++ b/manifests/profile/pacemaker/neutron.pp
@@ -24,7 +24,7 @@
#
# [*pacemaker_master*]
# (Optional) The hostname of the pacemaker master
-# Defaults to hiera('bootstrap_nodeid')
+# Defaults to hiera('bootstrap_nodeid', undef)
#
# [*enable_l3*]
# (Optional) Whether to include the Neutron L3 agent pacemaker profile
@@ -44,7 +44,7 @@
#
class tripleo::profile::pacemaker::neutron (
$step = hiera('step'),
- $pacemaker_master = hiera('bootstrap_nodeid'),
+ $pacemaker_master = hiera('bootstrap_nodeid', undef),
# We can drop the hiera defaults once the neutron roles are decomposed
$enable_l3 = hiera('neutron::enable_l3_agent', false),
$enable_dhcp = hiera('neutron::enable_dhcp_agent', false),
@@ -61,9 +61,7 @@ class tripleo::profile::pacemaker::neutron (
stop => '/bin/true',
}
- class { '::tripleo::profile::base::neutron':
- sync_db => ($::hostname == downcase($pacemaker_master)),
- }
+ include ::tripleo::profile::base::neutron
if $step >= 4 {
include ::neutron::params