diff options
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 7 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 34be39f3..570c43ba 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -227,6 +227,7 @@ if hiera('step') >= 3 { include ::neutron include ::neutron::server + include ::neutron::server::notifications include ::neutron::agents::l3 include ::neutron::agents::dhcp include ::neutron::agents::metadata @@ -307,15 +308,13 @@ if hiera('step') >= 3 { if $enable_ceph { - Ceph_pool { + $ceph_pools = hiera('ceph_pools') + ceph::pool { $ceph_pools : pg_num => hiera('ceph::profile::params::osd_pool_default_pg_num'), pgp_num => hiera('ceph::profile::params::osd_pool_default_pgp_num'), size => hiera('ceph::profile::params::osd_pool_default_size'), } - $ceph_pools = hiera('ceph_pools') - ceph::pool { $ceph_pools : } - $cinder_pool_requires = [Ceph::Pool[hiera('cinder_rbd_pool_name')]] } else { diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index b9623714..2a3f1f92 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -590,6 +590,7 @@ if hiera('step') >= 3 { manage_service => false, enabled => false, } + include ::neutron::server::notifications class { '::neutron::agents::dhcp' : manage_service => false, enabled => false, @@ -683,15 +684,13 @@ if hiera('step') >= 3 { if $enable_ceph { - Ceph_pool { + $ceph_pools = hiera('ceph_pools') + ceph::pool { $ceph_pools : pg_num => hiera('ceph::profile::params::osd_pool_default_pg_num'), pgp_num => hiera('ceph::profile::params::osd_pool_default_pgp_num'), size => hiera('ceph::profile::params::osd_pool_default_size'), } - $ceph_pools = hiera('ceph_pools') - ceph::pool { $ceph_pools : } - $cinder_pool_requires = [Ceph::Pool[hiera('cinder_rbd_pool_name')]] } else { |