diff options
| -rw-r--r-- | manifests/profile/base/neutron/server.pp | 9 | ||||
| -rw-r--r-- | manifests/profile/pacemaker/ceph/rbdmirror.pp | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 4667ae2..fcd804d 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -73,7 +73,7 @@ class tripleo::profile::base::neutron::server ( # We start neutron-server on the bootstrap node first, because # it will try to populate tables and we need to make sure this happens # before it starts on other nodes - if $step >= 4 and $sync_db { + if $step >= 4 and $sync_db or $step >= 5 and !$sync_db { include ::neutron::server::notifications # We need to override the hiera value neutron::server::sync_db which is set # to true @@ -82,11 +82,4 @@ class tripleo::profile::base::neutron::server ( l3_ha => $l3_ha, } } - if $step >= 5 and !$sync_db { - include ::neutron::server::notifications - class { '::neutron::server': - sync_db => $sync_db, - l3_ha => $l3_ha, - } - } } diff --git a/manifests/profile/pacemaker/ceph/rbdmirror.pp b/manifests/profile/pacemaker/ceph/rbdmirror.pp index 8e2ff77..308572c 100644 --- a/manifests/profile/pacemaker/ceph/rbdmirror.pp +++ b/manifests/profile/pacemaker/ceph/rbdmirror.pp @@ -37,7 +37,7 @@ # Defaults to hiera('step') # class tripleo::profile::pacemaker::ceph::rbdmirror ( - $bootstrap_node = hiera('ceph_rbdmirror_bootstrap_short_node_name'), + $bootstrap_node = hiera('ceph_rbdmirror_short_bootstrap_node_name'), $client_name = 'openstack', $stack_action = hiera('stack_action'), $step = hiera('step'), |