Browse Source

Merge "nova: include nova::cinder in more common place"

changes/33/776833/3
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
acf80e314a
4 changed files with 5 additions and 5 deletions
  1. +1
    -0
      manifests/profile/base/nova.pp
  2. +0
    -1
      manifests/profile/base/nova/compute.pp
  3. +0
    -4
      spec/classes/tripleo_profile_base_nova_compute_spec.rb
  4. +4
    -0
      spec/classes/tripleo_profile_base_nova_spec.rb

+ 1
- 0
manifests/profile/base/nova.pp View File

@ -144,6 +144,7 @@ class tripleo::profile::base::nova (
'ssl' => $oslomsg_notify_use_ssl_real,
}),
}
include nova::cinder
include nova::glance
include nova::placement
include nova::keystone::service_user


+ 0
- 1
manifests/profile/base/nova/compute.pp View File

@ -50,7 +50,6 @@ class tripleo::profile::base::nova::compute (
if $step >= 4 {
# deploy basic bits for nova
include tripleo::profile::base::nova
include nova::cinder
include nova::compute::image_cache
include nova::vendordata
include nova::compute::provider


+ 0
- 4
spec/classes/tripleo_profile_base_nova_compute_spec.rb View File

@ -28,7 +28,6 @@ describe 'tripleo::profile::base::nova::compute' do
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')
is_expected.to_not contain_class('tripleo::profile::base::nova')
is_expected.to_not contain_class('nova::cinder')
is_expected.to_not contain_class('nova::compute::image_cache')
is_expected.to_not contain_class('nova::vendordata')
is_expected.to_not contain_class('nova::compute')
@ -58,7 +57,6 @@ eos
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova::cinder')
is_expected.to contain_class('nova::compute::image_cache')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('nova::compute')
@ -86,7 +84,6 @@ eos
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova::cinder')
is_expected.to contain_class('nova::compute::image_cache')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('nova::compute')
@ -101,7 +98,6 @@ eos
it {
is_expected.to contain_class('tripleo::profile::base::nova::compute')
is_expected.to contain_class('tripleo::profile::base::nova')
is_expected.to contain_class('nova::cinder')
is_expected.to contain_class('nova::compute::image_cache')
is_expected.to contain_class('nova::vendordata')
is_expected.to contain_class('nova::compute')


+ 4
- 0
spec/classes/tripleo_profile_base_nova_spec.rb View File

@ -32,6 +32,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to_not contain_class('nova::config')
is_expected.to_not contain_class('nova::logging')
is_expected.to_not contain_class('nova::cache')
is_expected.to_not contain_class('nova::cinder')
is_expected.to_not contain_class('nova::glance')
is_expected.to_not contain_class('nova::placement')
is_expected.to_not contain_class('nova::keystone::service_user')
@ -57,6 +58,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to contain_class('nova::cache').with(
:memcache_servers => ['127.0.0.1:11211']
)
is_expected.to contain_class('nova::cinder')
is_expected.to contain_class('nova::glance')
is_expected.to contain_class('nova::placement')
is_expected.to contain_class('nova::keystone::service_user')
@ -77,6 +79,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to_not contain_class('nova::config')
is_expected.to_not contain_class('nova::logging')
is_expected.to_not contain_class('nova::cache')
is_expected.to_not contain_class('nova::cinder')
is_expected.to_not contain_class('nova::glance')
is_expected.to_not contain_class('nova::placement')
is_expected.to_not contain_class('nova::keystone::service_user')
@ -102,6 +105,7 @@ describe 'tripleo::profile::base::nova' do
is_expected.to contain_class('nova::config')
is_expected.to contain_class('nova::logging')
is_expected.to contain_class('nova::cache')
is_expected.to contain_class('nova::cinder')
is_expected.to contain_class('nova::glance')
is_expected.to contain_class('nova::placement')
is_expected.to contain_class('nova::keystone::service_user')


Loading…
Cancel
Save