diff --git a/manifests/api.pp b/manifests/api.pp
index bb2a4401..a7ac6ab7 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -101,42 +101,41 @@ class manila::api (
     include manila::db::sync
   }
 
-  if $enabled {
-    if $manage_service {
+  if $manage_service {
+    if $enabled {
       $ensure = 'running'
-    }
-  } else {
-    if $manage_service {
+    } else {
       $ensure = 'stopped'
     }
-  }
 
-  if $service_name == $::manila::params::api_service {
-    service { 'manila-api':
-      ensure    => $ensure,
-      name      => $::manila::params::api_service,
-      enable    => $enabled,
-      hasstatus => true,
-      tag       => 'manila-service',
-    }
+    if $service_name == $::manila::params::api_service {
+      service { 'manila-api':
+        ensure    => $ensure,
+        name      => $::manila::params::api_service,
+        enable    => $enabled,
+        hasstatus => true,
+        tag       => 'manila-service',
+      }
 
-  } elsif $service_name == 'httpd' {
-    # We need to make sure manila-api/eventlet is stopped before trying to
-    # start apache
-    service { 'manila-api':
-      ensure => 'stopped',
-      name   => $::manila::params::api_service,
-      enable => false,
-      tag    => ['manila-service'],
-    }
-    Service <| title == 'httpd' |> { tag +> 'manila-service' }
+    } elsif $service_name == 'httpd' {
+      # We need to make sure manila-api/eventlet is stopped before trying to
+      # start apache
+      service { 'manila-api':
+        ensure => 'stopped',
+        name   => $::manila::params::api_service,
+        enable => false,
+        tag    => ['manila-service'],
+      }
+      Service <| title == 'httpd' |> { tag +> 'manila-service' }
 
-    Service['manila-api'] -> Service[$service_name]
-  } else {
-    fail("Invalid service_name. Either use manila-api/openstack-manila-api \
+      Service['manila-api'] -> Service[$service_name]
+    } else {
+      fail("Invalid service_name. Either use manila-api/openstack-manila-api \
 for running as a standalone service, or httpd for being run by a httpd \
 server.")
+    }
   }
+
   manila_config {
     'DEFAULT/osapi_share_listen':      value => $bind_host;
     'DEFAULT/enabled_share_protocols': value => join(any2array($enabled_share_protocols), ',');
diff --git a/manifests/scheduler.pp b/manifests/scheduler.pp
index 904a3372..abc274f4 100644
--- a/manifests/scheduler.pp
+++ b/manifests/scheduler.pp
@@ -50,13 +50,13 @@ class manila::scheduler (
     } else {
       $ensure = 'stopped'
     }
-  }
 
-  service { 'manila-scheduler':
-    ensure    => $ensure,
-    name      => $::manila::params::scheduler_service,
-    enable    => $enabled,
-    hasstatus => true,
-    tag       => 'manila-service',
+    service { 'manila-scheduler':
+      ensure    => $ensure,
+      name      => $::manila::params::scheduler_service,
+      enable    => $enabled,
+      hasstatus => true,
+      tag       => 'manila-service',
+    }
   }
 }
diff --git a/manifests/share.pp b/manifests/share.pp
index f663f66a..d01fc719 100644
--- a/manifests/share.pp
+++ b/manifests/share.pp
@@ -38,14 +38,14 @@ class manila::share (
     } else {
       $ensure = 'stopped'
     }
-  }
 
-  service { 'manila-share':
-    ensure    => $ensure,
-    name      => $::manila::params::share_service,
-    enable    => $enabled,
-    hasstatus => true,
-    require   => Package['manila'],
-    tag       => 'manila-service',
+    service { 'manila-share':
+      ensure    => $ensure,
+      name      => $::manila::params::share_service,
+      enable    => $enabled,
+      hasstatus => true,
+      require   => Package['manila'],
+      tag       => 'manila-service',
+    }
   }
 }
diff --git a/spec/classes/manila_api_spec.rb b/spec/classes/manila_api_spec.rb
index 82057f8b..90eb603f 100644
--- a/spec/classes/manila_api_spec.rb
+++ b/spec/classes/manila_api_spec.rb
@@ -131,8 +131,8 @@ describe 'manila::api' do
         req_params.merge({'manage_service' => false})
       end
       it { is_expected.to contain_class('manila::policy') }
-      it 'should not change the state of the service' do
-        is_expected.to contain_service('manila-api').without_ensure
+      it 'should not configure the service' do
+        is_expected.to_not contain_service('manila-api')
       end
     end
 
diff --git a/spec/classes/manila_scheduler_spec.rb b/spec/classes/manila_scheduler_spec.rb
index 5450470f..ed3339ed 100644
--- a/spec/classes/manila_scheduler_spec.rb
+++ b/spec/classes/manila_scheduler_spec.rb
@@ -40,8 +40,8 @@ describe 'manila::scheduler' do
         { 'manage_service' => false
         }
       end
-      it 'should not change the state of the service' do
-        is_expected.to contain_service('manila-scheduler').without_ensure
+      it 'should not configure the service' do
+        is_expected.to_not contain_service('manila-scheduler')
       end
     end
   end
diff --git a/spec/classes/manila_share_spec.rb b/spec/classes/manila_share_spec.rb
index 5677aa13..e6b01cba 100644
--- a/spec/classes/manila_share_spec.rb
+++ b/spec/classes/manila_share_spec.rb
@@ -21,8 +21,8 @@ describe 'manila::share' do
       let :params do
         { 'manage_service' => false }
       end
-      it 'should not change the state of the service' do
-        is_expected.to contain_service('manila-share').without_ensure
+      it 'should not configure the service' do
+        is_expected.to_not contain_service('manila-share')
       end
     end
   end