Include the nova::glance class in more common place
... because some parameters of this class are supposed to be used in both nova-api and nova-compute. Depends-on: https://review.opendev.org/770684 Change-Id: I0c5700cb5123f81e88da9cbaeafca40525cfd6d8
This commit is contained in:
parent
973477d58d
commit
2752896548
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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')
|
||||
|
|
Loading…
Reference in New Issue