openstack
/
puppet-tripleo
Code Issues Proposed changes

nova: move placement credentials config at step 3 

nova placement credentials in nova.conf need to be configured at step 3
so Nova services can use them as soon as they start.

Change-Id: I0abdd305b7e6c8d83f23e25b3872e98eb56dd299
This commit is contained in:
Emilien Macchi 2017-02-10 21:17:16 -05:00
parent ca9fffc549
commit 9b12ee02f8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/nova.pp
View File

@ -107,10 +107,10 @@ class tripleo::profile::base::nova (
backend => 'oslo_cache.memcache_pool',
memcache_servers => $memcache_servers,
}
include ::nova::placement
}
if $step >= 4 {
include ::nova::placement
if $manage_migration {
class { '::nova::migration::libvirt':
configure_libvirt => $libvirt_enabled,

4
spec/classes/tripleo_profile_base_nova_spec.rb
View File

@ -49,6 +49,7 @@ describe 'tripleo::profile::base::nova' do
:default_transport_url => 'rabbit://nova:foo@localhost:5672/?ssl=0'
)
is_expected.to contain_class('nova::config')
is_expected.to contain_class('nova::placement')
is_expected.to contain_class('nova::cache').with(
:enabled => true,
:backend => 'oslo_cache.memcache_pool',
@ -70,6 +71,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to_not contain_class('nova')
is_expected.to_not contain_class('nova::config')
is_expected.to_not contain_class('nova::cache')
is_expected.to_not contain_class('nova::placement')
}
end
@ -86,6 +88,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to contain_class('nova')
is_expected.to contain_class('nova::config')
is_expected.to contain_class('nova::cache')
is_expected.to contain_class('nova::placement')
is_expected.to_not contain_class('nova::migration::libvirt')
}
end
@ -108,6 +111,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova')
is_expected.to contain_class('nova::config')
is_expected.to contain_class('nova::placement')
is_expected.to contain_class('nova::cache')
is_expected.to contain_class('nova::migration::libvirt').with(
:configure_libvirt => params[:libvirt_enabled],