diff options
Diffstat (limited to 'manifests/profile/pacemaker/neutron.pp')
| -rw-r--r-- | manifests/profile/pacemaker/neutron.pp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index 03ccbc3..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,10 @@ class tripleo::profile::pacemaker::neutron ( stop => '/bin/true', } + include ::tripleo::profile::base::neutron + if $step >= 4 { include ::neutron::params - include ::tripleo::profile::base::neutron # To be removed when puppet-oslo comes into service neutron_config { |