openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Include the nova::glance class in more common place"

This commit is contained in:
Zuul 2021-03-17 13:02:24 +00:00 committed by Gerrit Code Review
parent 50b5095d11 2752896548
commit 39e4a1df1d
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
manifests/profile/base/nova/compute.pp
View File

@ -53,7 +53,6 @@ class tripleo::profile::base::nova::compute (
include nova::cinder
include nova::compute::image_cache
include nova::vendordata
include nova::glance
include nova::compute::provider
# deploy basic bits for nova-compute

4
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::glance')
is_expected.to_not contain_class('nova::placement')
is_expected.to_not contain_class('nova::keystone::service_user')
}
@ -56,6 +57,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::glance')
is_expected.to contain_class('nova::placement')
is_expected.to contain_class('nova::keystone::service_user')
}
@ -75,6 +77,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::glance')
is_expected.to_not contain_class('nova::placement')
is_expected.to_not contain_class('nova::keystone::service_user')
}
@ -99,6 +102,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::glance')
is_expected.to contain_class('nova::placement')
is_expected.to contain_class('nova::keystone::service_user')
is_expected.to_not contain_class('nova::migration::libvirt')