Merge "Make sure neutron [placement] config section is set"
This commit is contained in:
commit
5b4bfac778
|
@ -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':
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue