openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Include neutron::server::notification::nova class"

This commit is contained in:
Zuul 2020-07-31 17:05:22 +00:00 committed by Gerrit Code Review
parent c0b9a6a2e5 416e4cd86f
commit d15de6c131
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/profile/base/neutron/server.pp
View File

@ -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::notifications::nova
include neutron::server::placement
# We need to override the hiera value neutron::server::sync_db which is set
# to true

6
spec/classes/tripleo_profile_base_neutron_server_spec.rb
View File

@ -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::notifications::nova')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::db')
@ -61,6 +62,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::notifications::nova')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::db')
@ -79,6 +81,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::notifications::nova')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::db')
@ -97,6 +100,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::notifications::nova')
is_expected.to contain_class('neutron::server::placement')
is_expected.to contain_class('neutron::server').with(
:sync_db => true,
@ -118,6 +122,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::notifications::nova')
is_expected.to_not contain_class('neutron::server::placement')
is_expected.to_not contain_class('neutron::server')
is_expected.to_not contain_class('neutron::db')
@ -136,6 +141,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::notifications::nova')
is_expected.to contain_class('neutron::server::placement')
is_expected.to contain_class('neutron::server').with(
:sync_db => false,

2
spec/fixtures/hieradata/default.yaml vendored
View File

@ -113,7 +113,7 @@ horizon_node_names:
#Neutron related
neutron::rabbit_password: 'password'
neutron::keystone::authtoken::password: 'password'
neutron::server::notifications::password: 'password'
neutron::server::notifications::nova::password: 'password'
neutron::server::placement::password: 'password'
# oslo.messaging related
oslo_messaging_rpc_password: 'password'