Merge "Include nova::workarounds for all nova services"

This commit is contained in:
Zuul 2020-10-26 17:18:44 +00:00 committed by Gerrit Code Review
commit 67cf7850b0
4 changed files with 7 additions and 2 deletions

View File

@ -328,7 +328,6 @@ class nova::compute (
include nova::deps
include nova::params
include nova::workarounds
$cpu_shared_set_real = pick(join(any2array($cpu_shared_set), ','), $::os_service_default)
$cpu_dedicated_set_real = pick(join(any2array($cpu_dedicated_set), ','), $::os_service_default)

View File

@ -38,7 +38,6 @@ class nova::conductor(
include nova::deps
include nova::db
include nova::params
include nova::workarounds
include nova::availability_zone
nova::generic_service { 'conductor':

View File

@ -522,6 +522,7 @@ class nova(
) inherits nova::params {
include nova::deps
include nova::workarounds
# maintain backward compatibility
include nova::db

View File

@ -6,6 +6,9 @@ describe 'nova' do
context 'with default parameters' do
it { is_expected.to contain_class('nova::deps') }
it { is_expected.to contain_class('nova::workarounds') }
it 'installs packages' do
is_expected.to contain_package('python-nova').with(
:ensure => 'present',
@ -116,6 +119,9 @@ describe 'nova' do
}
end
it { is_expected.to contain_class('nova::deps') }
it { is_expected.to contain_class('nova::workarounds') }
it 'installs packages' do
is_expected.to contain_package('nova-common').with('ensure' => '2012.1.1-15.el6')
is_expected.to contain_package('python-nova').with('ensure' => '2012.1.1-15.el6')