diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-13 20:22:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-13 20:22:17 +0000 |
| commit | bb5343553e32b450ccf4f7c3dce2242aedc3bbb1 (patch) | |
| tree | a3a42e2ab5ab5ab2adc9c25b4bdb30b4d9b0b5ef | |
| parent | b541bf5a370e40feac2f0a612d28989994c19040 (diff) | |
| parent | 9b12ee02f8d72bb9475922e259a246e9c7483555 (diff) | |
Merge "nova: move placement credentials config at step 3"
| -rw-r--r-- | manifests/profile/base/nova.pp | 2 | ||||
| -rw-r--r-- | spec/classes/tripleo_profile_base_nova_spec.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index fe1e6a6..cb34521 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -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, diff --git a/spec/classes/tripleo_profile_base_nova_spec.rb b/spec/classes/tripleo_profile_base_nova_spec.rb index 8ba78af..68b01e9 100644 --- a/spec/classes/tripleo_profile_base_nova_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_spec.rb @@ -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], |