diff --git a/manifests/api.pp b/manifests/api.pp
index 95f9105..10d5cfd 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -73,39 +73,39 @@ class cloudkitty::api (
     tag    => ['openstack', 'cloudkitty-package'],
   }
 
+  if $sync_db {
+    include cloudkitty::db::sync
+  }
+
   if $manage_service {
     if $enabled {
       $service_ensure = 'running'
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  if $sync_db {
-    include cloudkitty::db::sync
-  }
+    if $service_name == $::cloudkitty::params::api_service_name {
+      service { 'cloudkitty-api':
+        enable     => $enabled,
+        name       => 'cloudkitty-api',
+        hasstatus  => true,
+        hasrestart => true,
+        tag        => 'cloudkitty-service',
+      }
+    } elsif $service_name == 'httpd' {
+      service { 'cloudkitty-api':
+        ensure => 'stopped',
+        name   => $::cloudkitty::params::api_service_name,
+        enable => false,
+        tag    => 'cloudkitty-service',
+      }
+      Service <| title == 'httpd' |> { tag +> 'cloudkitty-service' }
 
-  if $service_name == $::cloudkitty::params::api_service_name {
-    service { 'cloudkitty-api':
-      enable     => $enabled,
-      name       => 'cloudkitty-api',
-      hasstatus  => true,
-      hasrestart => true,
-      tag        => 'cloudkitty-service',
+      # we need to make sure cloudkitty-api/eventlet is stopped before trying to start apache
+      Service['cloudkitty-api'] -> Service[$service_name]
+    } else {
+      fail('Invalid service_name. Only httpd for being run by a httpd server')
     }
-  } elsif $service_name == 'httpd' {
-    service { 'cloudkitty-api':
-      ensure => 'stopped',
-      name   => $::cloudkitty::params::api_service_name,
-      enable => false,
-      tag    => 'cloudkitty-service',
-    }
-    Service <| title == 'httpd' |> { tag +> 'cloudkitty-service' }
-
-    # we need to make sure cloudkitty-api/eventlet is stopped before trying to start apache
-    Service['cloudkitty-api'] -> Service[$service_name]
-  } else {
-    fail('Invalid service_name. Only httpd for being run by a httpd server')
   }
 
   cloudkitty_config {
diff --git a/manifests/processor.pp b/manifests/processor.pp
index cf94987..cd3c865 100644
--- a/manifests/processor.pp
+++ b/manifests/processor.pp
@@ -87,15 +87,15 @@ class cloudkitty::processor (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'cloudkitty-processor':
-    ensure     => $service_ensure,
-    name       => $::cloudkitty::params::processor_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => 'cloudkitty-service',
+    service { 'cloudkitty-processor':
+      ensure     => $service_ensure,
+      name       => $::cloudkitty::params::processor_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => 'cloudkitty-service',
+    }
   }
 
   cloudkitty_config {
diff --git a/spec/classes/cloudkitty_processor_spec.rb b/spec/classes/cloudkitty_processor_spec.rb
index 97a931e..0e21e3f 100644
--- a/spec/classes/cloudkitty_processor_spec.rb
+++ b/spec/classes/cloudkitty_processor_spec.rb
@@ -76,15 +76,8 @@ describe 'cloudkitty::processor' do
           :manage_service => false }
       end
 
-      it 'configures cloudkitty-processor service' do
-        is_expected.to contain_service('cloudkitty-processor').with(
-          :ensure     => nil,
-          :name       => platform_params[:processor_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'cloudkitty-service',
-        )
+      it 'does not configure cloudkitty-processor service' do
+        is_expected.to_not contain_service('cloudkitty-processor')
       end
     end
   end