openstack/puppet-nova
Code Issues Proposed changes

Include nova::workarounds for all nova services

Browse Source 
nova::workarounds is used for config options in the [workarounds] section in
nova.conf.
Right now it is just included for the conductor and compute services as the
two existing params only apply to these services.
However workaround config params can apply to any or all nova services so it
should be included for all services.

Change-Id: Ie27fb87f1446d1570e0eb7608812ddfa70b7f91f
This commit is contained in:
Oliver Walsh 2020-10-22 21:26:06 +01:00 committed by Takashi Kajinami
parent 9f26045197
commit 8bcd0c74df
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/compute.pp
View File

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

1
manifests/conductor.pp
View File

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

1
manifests/init.pp
View File

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

6
spec/classes/nova_init_spec.rb
View File

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