From a7b46e1ef677bff5d0601d54b872e3fa3374b13c Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 4 May 2021 17:55:32 +0900
Subject: [PATCH] Do not declare service resources when manage_service is false

This change ensures that service resources are not declared when
manage_service is false, to fix rspec-puppet 2.7.1 support.

Change-Id: I86e05c5182842b73d413ddc95f797c1da5fd0ac2
---
 manifests/health_manager.pp                 | 16 ++++++++--------
 manifests/housekeeping.pp                   | 16 ++++++++--------
 manifests/worker.pp                         | 20 +++++++++++---------
 spec/classes/octavia_health_manager_spec.rb | 11 ++---------
 spec/classes/octavia_housekeeping_spec.rb   | 11 ++---------
 spec/classes/octavia_worker_spec.rb         | 11 ++---------
 6 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/manifests/health_manager.pp b/manifests/health_manager.pp
index 906edb55..8a268dc9 100644
--- a/manifests/health_manager.pp
+++ b/manifests/health_manager.pp
@@ -68,15 +68,15 @@ class octavia::health_manager (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'octavia-health-manager':
-    ensure     => $service_ensure,
-    name       => $::octavia::params::health_manager_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => ['octavia-service'],
+    service { 'octavia-health-manager':
+      ensure     => $service_ensure,
+      name       => $::octavia::params::health_manager_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => ['octavia-service'],
+    }
   }
 
   octavia_config {
diff --git a/manifests/housekeeping.pp b/manifests/housekeeping.pp
index a222899d..d3bba576 100644
--- a/manifests/housekeeping.pp
+++ b/manifests/housekeeping.pp
@@ -77,15 +77,15 @@ class octavia::housekeeping (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'octavia-housekeeping':
-    ensure     => $service_ensure,
-    name       => $::octavia::params::housekeeping_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => ['octavia-service'],
+    service { 'octavia-housekeeping':
+      ensure     => $service_ensure,
+      name       => $::octavia::params::housekeeping_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => ['octavia-service'],
+    }
   }
 
   octavia_config {
diff --git a/manifests/worker.pp b/manifests/worker.pp
index 7fd05b18..b04e8166 100644
--- a/manifests/worker.pp
+++ b/manifests/worker.pp
@@ -86,7 +86,9 @@ class octavia::worker (
       }
       $nova_flavor_defaults = merge($octavia_flavor_defaults, $nova_flavor_config)
       create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults)
-      Nova_flavor<| tag == 'octavia' |> ~> Service['octavia-worker']
+      if $manage_service {
+        Nova_flavor<| tag == 'octavia' |> ~> Service['octavia-worker']
+      }
     }
   }
 
@@ -102,15 +104,15 @@ class octavia::worker (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'octavia-worker':
-    ensure     => $service_ensure,
-    name       => $::octavia::params::worker_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => ['octavia-service'],
+    service { 'octavia-worker':
+      ensure     => $service_ensure,
+      name       => $::octavia::params::worker_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => ['octavia-service'],
+    }
   }
 
   if $manage_keygen and ! $::octavia::controller::enable_ssh_access {
diff --git a/spec/classes/octavia_health_manager_spec.rb b/spec/classes/octavia_health_manager_spec.rb
index e592c5bf..097757ae 100644
--- a/spec/classes/octavia_health_manager_spec.rb
+++ b/spec/classes/octavia_health_manager_spec.rb
@@ -71,15 +71,8 @@ describe 'octavia::health_manager' do
           :enabled        => false })
       end
 
-      it 'configures octavia-health-manager service' do
-        is_expected.to contain_service('octavia-health-manager').with(
-          :ensure     => nil,
-          :name       => platform_params[:health_manager_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => ['octavia-service'],
-        )
+      it 'does not configure octavia-health-manager service' do
+        is_expected.to_not contain_service('octavia-health-manager')
       end
     end
 
diff --git a/spec/classes/octavia_housekeeping_spec.rb b/spec/classes/octavia_housekeeping_spec.rb
index e9ee9a59..f21054cf 100644
--- a/spec/classes/octavia_housekeeping_spec.rb
+++ b/spec/classes/octavia_housekeeping_spec.rb
@@ -77,15 +77,8 @@ describe 'octavia::housekeeping' do
           :enabled        => false })
       end
 
-      it 'configures octavia-housekeeping service' do
-        is_expected.to contain_service('octavia-housekeeping').with(
-          :ensure     => nil,
-          :name       => platform_params[:housekeeping_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => ['octavia-service'],
-        )
+      it 'does not configure octavia-housekeeping service' do
+        is_expected.to_not contain_service('octavia-housekeeping')
       end
     end
 
diff --git a/spec/classes/octavia_worker_spec.rb b/spec/classes/octavia_worker_spec.rb
index 5fc27b34..ad6f8eed 100644
--- a/spec/classes/octavia_worker_spec.rb
+++ b/spec/classes/octavia_worker_spec.rb
@@ -116,15 +116,8 @@ describe 'octavia::worker' do
           :enabled        => false })
       end
 
-      it 'configures octavia-worker service' do
-        is_expected.to contain_service('octavia-worker').with(
-          :ensure     => nil,
-          :name       => platform_params[:worker_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => ['octavia-service'],
-        )
+      it 'does not configure octavia-worker service' do
+        is_expected.to_not contain_service('octavia-worker')
       end
     end