Do not define service resource when service management is disabled

Change-Id: I64d3da1c9c6e379f410cf575c874c9d8d3153bb8

manifests/api.pp

@@ -184,15 +184,12 @@ Use cinder::nova::region_name instead')
     include cinder::db::sync
   }
 
+  if $manage_service {
     if $enabled {
-    if $manage_service {
       $ensure = 'running'
-    }
     } else {
-    if $manage_service {
       $ensure = 'stopped'
     }
-  }
 
     if $service_name == $::cinder::params::api_service {
       service { 'cinder-api':
@@ -218,6 +215,7 @@ Use cinder::nova::region_name instead')
       fail("Invalid service_name. Either cinder-api/openstack-cinder-api for \
 running as a standalone service, or httpd for being run by a httpd server")
     }
+  }
 
   cinder_config {
     'DEFAULT/osapi_volume_listen':      value => $bind_host;

manifests/backup.pp

@@ -88,7 +88,6 @@ class cinder::backup (
     } else {
       $ensure = 'stopped'
     }
-  }
 
     service { 'cinder-backup':
       ensure    => $ensure,
@@ -97,6 +96,7 @@ class cinder::backup (
       hasstatus => true,
       tag       => 'cinder-service',
     }
+  }
 
   cinder_config {
     'DEFAULT/backup_manager':        value => $backup_manager;

manifests/scheduler.pp

@@ -50,7 +50,6 @@ class cinder::scheduler (
     } else {
       $ensure = 'stopped'
     }
-  }
 
     service { 'cinder-scheduler':
       ensure    => $ensure,
@@ -59,4 +58,5 @@ class cinder::scheduler (
       hasstatus => true,
       tag       => 'cinder-service',
     }
+  }
 }

manifests/volume.pp

@@ -92,7 +92,6 @@ class cinder::volume (
     } else {
       $ensure = 'stopped'
     }
-  }
 
     service { 'cinder-volume':
       ensure    => $ensure,
@@ -101,6 +100,7 @@ class cinder::volume (
       hasstatus => true,
       tag       => 'cinder-service',
     }
+  }
 
   cinder_config {
     'DEFAULT/cluster':                              value => $cluster;

spec/classes/cinder_api_spec.rb

@@ -101,7 +101,7 @@ describe 'cinder::api' do
         req_params.merge({'manage_service' => false})
       end
       it 'should not change the state of the service' do
-        is_expected.to contain_service('cinder-api').without_ensure
+        is_expected.to_not contain_service('cinder-api')
       end
       it 'includes cinder::db::sync' do
         is_expected.to contain_class('cinder::db::sync')

spec/classes/cinder_backup_spec.rb

@@ -91,13 +91,8 @@ describe 'cinder::backup' do
       before :each do
         params.merge!(:manage_service => false)
       end
-      it 'should not change the state of the service' do
+      it 'should not configure the service' do
-        is_expected.to contain_service('cinder-backup').with(
+        is_expected.to_not contain_service('cinder-backup')
-          :ensure    => nil,
-          :name      => platform_params[:backup_service],
-          :hasstatus => true,
-          :tag       => 'cinder-service',
-        )
       end
     end
 

spec/classes/cinder_scheduler_spec.rb

@@ -40,7 +40,7 @@ describe 'cinder::scheduler' do
         }
       end
 
-      it { is_expected.to contain_service('cinder-scheduler').without_ensure }
+      it { is_expected.to_not contain_service('cinder-scheduler') }
     end
   end
 

spec/classes/cinder_volume_spec.rb

@@ -32,7 +32,7 @@ describe 'cinder::volume' do
         }
       end
 
-      it { is_expected.to contain_service('cinder-volume').without_ensure }
+      it { is_expected.to_not contain_service('cinder-volume') }
     end
 
     context 'with parameters overridden' do