diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp index 4b3a3c3f7..87782fdd7 100644 --- a/manifests/profile/base/neutron/server.pp +++ b/manifests/profile/base/neutron/server.pp @@ -147,6 +147,7 @@ class tripleo::profile::base::neutron::server ( if $step >= 4 and $sync_db or $step >= 5 and !$sync_db { include neutron::server::notifications + include neutron::server::placement # We need to override the hiera value neutron::server::sync_db which is set # to true class { 'neutron::server': diff --git a/spec/classes/tripleo_profile_base_neutron_server_spec.rb b/spec/classes/tripleo_profile_base_neutron_server_spec.rb index 918a4205c..6aeb8b2fc 100644 --- a/spec/classes/tripleo_profile_base_neutron_server_spec.rb +++ b/spec/classes/tripleo_profile_base_neutron_server_spec.rb @@ -43,6 +43,7 @@ eos is_expected.to contain_class('tripleo::profile::base::neutron::authtoken') is_expected.to_not contain_class('tripleo::profile::base::apache') is_expected.to_not contain_class('neutron::server::notifications') + is_expected.to_not contain_class('neutron::server::placement') is_expected.to_not contain_class('neutron::server') is_expected.to_not contain_class('neutron::quota') end @@ -59,6 +60,7 @@ eos is_expected.to contain_class('tripleo::profile::base::neutron::authtoken') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to_not contain_class('neutron::server::notifications') + is_expected.to_not contain_class('neutron::server::placement') is_expected.to_not contain_class('neutron::server') is_expected.to_not contain_class('neutron::quota') end @@ -75,6 +77,7 @@ eos is_expected.to contain_class('tripleo::profile::base::neutron::authtoken') is_expected.to_not contain_class('tripleo::profile::base::apache') is_expected.to_not contain_class('neutron::server::notifications') + is_expected.to_not contain_class('neutron::server::placement') is_expected.to_not contain_class('neutron::server') is_expected.to_not contain_class('neutron::quota') end @@ -91,6 +94,7 @@ eos is_expected.to contain_class('tripleo::profile::base::neutron::authtoken') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to contain_class('neutron::server::notifications') + is_expected.to contain_class('neutron::server::placement') is_expected.to contain_class('neutron::server').with( :sync_db => true, :l3_ha => false, @@ -110,6 +114,7 @@ eos is_expected.to contain_class('tripleo::profile::base::neutron::authtoken') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to_not contain_class('neutron::server::notifications') + is_expected.to_not contain_class('neutron::server::placement') is_expected.to_not contain_class('neutron::server') is_expected.to_not contain_class('neutron::quota') end @@ -126,6 +131,7 @@ eos is_expected.to contain_class('tripleo::profile::base::neutron::authtoken') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to contain_class('neutron::server::notifications') + is_expected.to contain_class('neutron::server::placement') is_expected.to contain_class('neutron::server').with( :sync_db => false, :l3_ha => false, diff --git a/spec/fixtures/hieradata/default.yaml b/spec/fixtures/hieradata/default.yaml index 4dd732b64..1c6182144 100644 --- a/spec/fixtures/hieradata/default.yaml +++ b/spec/fixtures/hieradata/default.yaml @@ -103,6 +103,7 @@ horizon_node_names: neutron::rabbit_password: 'password' neutron::keystone::authtoken::password: 'password' neutron::server::notifications::password: 'password' +neutron::server::placement::password: 'password' # oslo.messaging related oslo_messaging_rpc_password: 'password' oslo_messaging_notify_password: 'password'