Do not declare service resource when manage_service is false

Change-Id: I4922f159985adb0e97daeb41d842d47ba8bee5fa

manifests/api.pp

@@ -92,31 +92,31 @@ class mistral::api (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  if $service_name == $::mistral::params::api_service_name {
+    if $service_name == $::mistral::params::api_service_name {
-    service { 'mistral-api':
+      service { 'mistral-api':
-      ensure     => $service_ensure,
+        ensure     => $service_ensure,
-      name       => $::mistral::params::api_service_name,
+        name       => $::mistral::params::api_service_name,
-      enable     => $enabled,
+        enable     => $enabled,
-      hasstatus  => true,
+        hasstatus  => true,
-      hasrestart => true,
+        hasrestart => true,
-      tag        => 'mistral-service',
+        tag        => 'mistral-service',
-    }
+      }
-  } elsif $service_name == 'httpd' {
+    } elsif $service_name == 'httpd' {
-    service { 'mistral-api':
+      service { 'mistral-api':
-      ensure => 'stopped',
+        ensure => 'stopped',
-      name   => $::mistral::params::api_service_name,
+        name   => $::mistral::params::api_service_name,
-      enable => false,
+        enable => false,
-      tag    => 'mistral-service',
+        tag    => 'mistral-service',
-    }
+      }
-    Service <| title == 'httpd' |> { tag +> 'mistral-service' }
+      Service <| title == 'httpd' |> { tag +> 'mistral-service' }
 
-    # we need to make sure mistral-api s stopped before trying to start apache
+      # we need to make sure mistral-api s stopped before trying to start apache
-    Service['mistral-api'] -> Service[$service_name]
+      Service['mistral-api'] -> Service[$service_name]
-  } else {
+    } else {
-    fail("Invalid service_name. Either mistral/openstack-mistral-api for running \
+      fail("Invalid service_name. Either mistral/openstack-mistral-api for running \
-as a standalone service, or httpd for being run by a httpd server")
+ as a standalone service, or httpd for being run by a httpd server")
+    }
   }
 
   mistral_config {

manifests/engine.pp

@@ -74,15 +74,15 @@ class mistral::engine (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'mistral-engine':
+    service { 'mistral-engine':
-    ensure     => $service_ensure,
+      ensure     => $service_ensure,
-    name       => $::mistral::params::engine_service_name,
+      name       => $::mistral::params::engine_service_name,
-    enable     => $enabled,
+      enable     => $enabled,
-    hasstatus  => true,
+      hasstatus  => true,
-    hasrestart => true,
+      hasrestart => true,
-    tag        => 'mistral-service',
+      tag        => 'mistral-service',
+    }
   }
 
   mistral_config {

manifests/event_engine.pp

@@ -52,15 +52,15 @@ class mistral::event_engine (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'mistral-event-engine':
+    service { 'mistral-event-engine':
-    ensure     => $service_ensure,
+      ensure     => $service_ensure,
-    name       => $::mistral::params::event_engine_service_name,
+      name       => $::mistral::params::event_engine_service_name,
-    enable     => $enabled,
+      enable     => $enabled,
-    hasstatus  => true,
+      hasstatus  => true,
-    hasrestart => true,
+      hasrestart => true,
-    tag        => 'mistral-service',
+      tag        => 'mistral-service',
+    }
   }
 
   mistral_config {

manifests/executor.pp

@@ -52,15 +52,15 @@ class mistral::executor (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'mistral-executor':
+    service { 'mistral-executor':
-    ensure     => $service_ensure,
+      ensure     => $service_ensure,
-    name       => $::mistral::params::executor_service_name,
+      name       => $::mistral::params::executor_service_name,
-    enable     => $enabled,
+      enable     => $enabled,
-    hasstatus  => true,
+      hasstatus  => true,
-    hasrestart => true,
+      hasrestart => true,
-    tag        => 'mistral-service',
+      tag        => 'mistral-service',
+    }
   }
 
   mistral_config {

spec/classes/mistral_api_spec.rb

@@ -45,7 +45,7 @@ describe 'mistral::api' do
 
         it 'configures mistral-api service' do
           is_expected.to contain_service('mistral-api').with(
-            :ensure     => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
+            :ensure     => params[:enabled] ? 'running' : 'stopped',
             :name       => platform_params[:api_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
@@ -80,20 +80,12 @@ describe 'mistral::api' do
     context 'with disabled service managing' do
       before do
         params.merge!({
-          :manage_service => false,
+          :manage_service => false
-          :enabled        => false })
+        })
       end
 
-      it 'configures mistral-api service' do
+      it 'does not configure mistral-api service' do
-        is_expected.to contain_service('mistral-api').with(
+        is_expected.to_not contain_service('mistral-api')
-          :ensure     => nil,
-          :name       => platform_params[:api_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'mistral-service',
-        )
-        is_expected.to contain_service('mistral-api').that_subscribes_to(nil)
       end
     end
 

spec/classes/mistral_engine_spec.rb

@@ -34,7 +34,7 @@ describe 'mistral::engine' do
 
         it 'configures mistral-engine service' do
           is_expected.to contain_service('mistral-engine').with(
-            :ensure     => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
+            :ensure     => params[:enabled] ? 'running' : 'stopped',
             :name       => platform_params[:engine_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
@@ -49,20 +49,12 @@ describe 'mistral::engine' do
     context 'with disabled service managing' do
       before do
         params.merge!({
-          :manage_service => false,
+          :manage_service => false
-          :enabled        => false })
+        })
       end
 
-      it 'configures mistral-engine service' do
+      it 'does not configure mistral-engine service' do
-        is_expected.to contain_service('mistral-engine').with(
+        is_expected.to_not contain_service('mistral-engine')
-          :ensure     => nil,
-          :name       => platform_params[:engine_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'mistral-service',
-        )
-        is_expected.to contain_service('mistral-engine').that_subscribes_to(nil)
       end
     end
   end

spec/classes/mistral_event_engine_spec.rb

@@ -31,7 +31,7 @@ describe 'mistral::event_engine' do
         it 'configures mistral-event-engine service' do
 
           is_expected.to contain_service('mistral-event-engine').with(
-            :ensure     => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
+            :ensure     => params[:enabled] ? 'running' : 'stopped',
             :name       => platform_params[:event_engine_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
@@ -46,21 +46,12 @@ describe 'mistral::event_engine' do
     context 'with disabled service managing' do
       before do
         params.merge!({
-          :manage_service => false,
+          :manage_service => false
-          :enabled        => false })
+        })
       end
 
-      it 'configures mistral-event-engine service' do
+      it 'does not configure mistral-event-engine service' do
-
+        is_expected.to_not contain_service('mistral-event-engine')
-        is_expected.to contain_service('mistral-event-engine').with(
-          :ensure     => nil,
-          :name       => platform_params[:event_engine_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'mistral-service',
-        )
-        is_expected.to contain_service('mistral-event-engine').that_subscribes_to(nil)
       end
     end
 

spec/classes/mistral_executor_spec.rb

@@ -29,7 +29,7 @@ describe 'mistral::executor' do
         it 'configures mistral-executor service' do
 
           is_expected.to contain_service('mistral-executor').with(
-            :ensure     => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
+            :ensure     => params[:enabled] ? 'running' : 'stopped',
             :name       => platform_params[:executor_service_name],
             :enable     => params[:enabled],
             :hasstatus  => true,
@@ -44,20 +44,12 @@ describe 'mistral::executor' do
     context 'with disabled service managing' do
       before do
         params.merge!({
-          :manage_service => false,
+          :manage_service => false
-          :enabled        => false })
+        })
       end
 
-      it 'configures mistral-executor service' do
+      it 'does not configure mistral-executor service' do
-        is_expected.to contain_service('mistral-executor').with(
+        is_expected.to_not contain_service('mistral-executor')
-          :ensure     => nil,
-          :name       => platform_params[:executor_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'mistral-service',
-        )
-        is_expected.to contain_service('mistral-executor').that_subscribes_to(nil)
       end
     end
   end