diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-07-04 13:45:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-07-04 13:45:21 +0000 |
| commit | 74d931de3a25fc48d832a2f975a7c34254c0961d (patch) | |
| tree | a1b4724f3f03d9659058d676376f0ab47ddf4aa7 /manifests/profile/pacemaker/neutron.pp | |
| parent | 6c315e8999f54cf6dd1a1faf2159660b2e2e2e53 (diff) | |
| parent | 476ee9b1a1de80101c29b09ea4ddff916e2f721e (diff) | |
Merge "Set bootstrap_nodeid to undef by default"
Diffstat (limited to 'manifests/profile/pacemaker/neutron.pp')
| -rw-r--r-- | manifests/profile/pacemaker/neutron.pp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/profile/pacemaker/neutron.pp b/manifests/profile/pacemaker/neutron.pp index 2af53dc..fff731d 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), |