From 8bcd0c74dfb6ebedb65c879682ea5e12a847974a Mon Sep 17 00:00:00 2001
From: Oliver Walsh <owalsh@redhat.com>
Date: Thu, 22 Oct 2020 21:26:06 +0100
Subject: [PATCH] Include nova::workarounds for all nova services

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
---
 manifests/compute.pp           | 1 -
 manifests/conductor.pp         | 1 -
 manifests/init.pp              | 1 +
 spec/classes/nova_init_spec.rb | 6 ++++++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/manifests/compute.pp b/manifests/compute.pp
index 340942bd6..88faa4280 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -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)
diff --git a/manifests/conductor.pp b/manifests/conductor.pp
index 049cfe51e..ae713b74e 100644
--- a/manifests/conductor.pp
+++ b/manifests/conductor.pp
@@ -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':
diff --git a/manifests/init.pp b/manifests/init.pp
index 80b30d180..56fc0c483 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -522,6 +522,7 @@ class nova(
 ) inherits nova::params {
 
   include nova::deps
+  include nova::workarounds
 
   # maintain backward compatibility
   include nova::db
diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
index 27665c3eb..08e82b72c 100644
--- a/spec/classes/nova_init_spec.rb
+++ b/spec/classes/nova_init_spec.rb
@@ -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')