diff --git a/manifests/api.pp b/manifests/api.pp
index 259b9f9f..19544456 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -76,42 +76,42 @@ class aodh::api (
     tag    => ['openstack', 'aodh-package'],
   }
 
-  if $manage_service {
-    if $enabled {
-      $service_ensure = 'running'
-    } else {
-      $service_ensure = 'stopped'
-    }
-  }
-
   if $sync_db {
     include aodh::db::sync
   }
 
-  if $service_name == $::aodh::params::api_service_name {
-    service { 'aodh-api':
-      ensure     => $service_ensure,
-      name       => $::aodh::params::api_service_name,
-      enable     => $enabled,
-      hasstatus  => true,
-      hasrestart => true,
-      tag        => 'aodh-service',
-    }
-  } elsif $service_name == 'httpd' {
-    include apache::params
-    service { 'aodh-api':
-      ensure => 'stopped',
-      name   => $::aodh::params::api_service_name,
-      enable => false,
-      tag    => 'aodh-service',
-    }
-    Service <| title == 'httpd' |> { tag +> 'aodh-service' }
+  if $manage_service {
+    if $service_name == $::aodh::params::api_service_name {
+      if $enabled {
+        $service_ensure = 'running'
+      } else {
+        $service_ensure = 'stopped'
+      }
 
-    # we need to make sure aodh-api/eventlet is stopped before trying to start apache
-    Service['aodh-api'] -> Service[$service_name]
-  } else {
-    fail("Invalid service_name. Either aodh/openstack-aodh-api for running \
+      service { 'aodh-api':
+        ensure     => $service_ensure,
+        name       => $::aodh::params::api_service_name,
+        enable     => $enabled,
+        hasstatus  => true,
+        hasrestart => true,
+        tag        => 'aodh-service',
+      }
+    } elsif $service_name == 'httpd' {
+      include apache::params
+      service { 'aodh-api':
+        ensure => 'stopped',
+        name   => $::aodh::params::api_service_name,
+        enable => false,
+        tag    => 'aodh-service',
+      }
+      Service <| title == 'httpd' |> { tag +> 'aodh-service' }
+
+      # we need to make sure aodh-api/eventlet is stopped before trying to start apache
+      Service['aodh-api'] -> Service[$service_name]
+    } else {
+      fail("Invalid service_name. Either aodh/openstack-aodh-api for running \
 as a standalone service, or httpd for being run by a httpd server")
+    }
   }
 
   aodh_config {
diff --git a/manifests/db.pp b/manifests/db.pp
index bff142cd..ffc3f40c 100644
--- a/manifests/db.pp
+++ b/manifests/db.pp
@@ -70,7 +70,12 @@ class aodh::db (
 
   include aodh::deps
 
-  if $::aodh::database_min_pool_size or $database_min_pool_size {
+  if defined('$::aodh::database_min_pool_size') {
+    $database_min_pool_size_real = $::aodh::database_min_pool_size
+  } else {
+    $database_min_pool_size_real = $database_min_pool_size
+  }
+  if $database_min_pool_size_real {
     warning('The database_min_pool_size parameter is deprecated, and will be removed in a future release.')
   }
 
diff --git a/manifests/evaluator.pp b/manifests/evaluator.pp
index 809e6920..1b2f9df0 100644
--- a/manifests/evaluator.pp
+++ b/manifests/evaluator.pp
@@ -58,14 +58,14 @@ class aodh::evaluator (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'aodh-evaluator':
-    ensure     => $service_ensure,
-    name       => $::aodh::params::evaluator_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => ['aodh-service','aodh-db-sync-service']
+    service { 'aodh-evaluator':
+      ensure     => $service_ensure,
+      name       => $::aodh::params::evaluator_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => ['aodh-service','aodh-db-sync-service']
+    }
   }
 }
diff --git a/manifests/listener.pp b/manifests/listener.pp
index a5447368..33be0ed1 100644
--- a/manifests/listener.pp
+++ b/manifests/listener.pp
@@ -33,14 +33,14 @@ class aodh::listener (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'aodh-listener':
-    ensure     => $service_ensure,
-    name       => $::aodh::params::listener_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => 'aodh-service',
+    service { 'aodh-listener':
+      ensure     => $service_ensure,
+      name       => $::aodh::params::listener_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => 'aodh-service',
+    }
   }
 }
diff --git a/manifests/notifier.pp b/manifests/notifier.pp
index ebf6c6f5..58a637f2 100644
--- a/manifests/notifier.pp
+++ b/manifests/notifier.pp
@@ -33,14 +33,14 @@ class aodh::notifier (
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  service { 'aodh-notifier':
-    ensure     => $service_ensure,
-    name       => $::aodh::params::notifier_service_name,
-    enable     => $enabled,
-    hasstatus  => true,
-    hasrestart => true,
-    tag        => 'aodh-service',
+    service { 'aodh-notifier':
+      ensure     => $service_ensure,
+      name       => $::aodh::params::notifier_service_name,
+      enable     => $enabled,
+      hasstatus  => true,
+      hasrestart => true,
+      tag        => 'aodh-service',
+    }
   }
 }
diff --git a/spec/classes/aodh_api_spec.rb b/spec/classes/aodh_api_spec.rb
index 2cc74702..4ff5a2db 100644
--- a/spec/classes/aodh_api_spec.rb
+++ b/spec/classes/aodh_api_spec.rb
@@ -111,15 +111,8 @@ describe 'aodh::api' do
           :enabled        => false })
       end
 
-      it 'configures aodh-api service' do
-        is_expected.to contain_service('aodh-api').with(
-          :ensure     => nil,
-          :name       => platform_params[:api_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'aodh-service',
-        )
+      it 'should not configure aodh-api service' do
+        is_expected.to_not contain_service('aodh-api')
       end
     end
 
diff --git a/spec/classes/aodh_evaluator_spec.rb b/spec/classes/aodh_evaluator_spec.rb
index eef261d0..55ca1e37 100644
--- a/spec/classes/aodh_evaluator_spec.rb
+++ b/spec/classes/aodh_evaluator_spec.rb
@@ -87,15 +87,8 @@ describe 'aodh::evaluator' do
           :manage_service => false }
       end
 
-      it 'configures aodh-evaluator service' do
-        is_expected.to contain_service('aodh-evaluator').with(
-          :ensure     => nil,
-          :name       => platform_params[:evaluator_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => ['aodh-service','aodh-db-sync-service']
-        )
+      it 'should not configure aodh-evaluator service' do
+        is_expected.to_not contain_service('aodh-evaluator')
       end
     end
   end
diff --git a/spec/classes/aodh_listener_spec.rb b/spec/classes/aodh_listener_spec.rb
index da83ed98..c0731b7b 100644
--- a/spec/classes/aodh_listener_spec.rb
+++ b/spec/classes/aodh_listener_spec.rb
@@ -56,15 +56,8 @@ describe 'aodh::listener' do
           :manage_service => false }
       end
 
-      it 'configures aodh-listener service' do
-        is_expected.to contain_service('aodh-listener').with(
-          :ensure     => nil,
-          :name       => platform_params[:listener_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'aodh-service',
-        )
+      it 'should not configure aodh-listener service' do
+        is_expected.to_not contain_service('aodh-listener')
       end
     end
   end
diff --git a/spec/classes/aodh_notifier_spec.rb b/spec/classes/aodh_notifier_spec.rb
index 14409a3b..2ecb7161 100644
--- a/spec/classes/aodh_notifier_spec.rb
+++ b/spec/classes/aodh_notifier_spec.rb
@@ -56,15 +56,8 @@ describe 'aodh::notifier' do
           :manage_service => false }
       end
 
-      it 'configures aodh-notifier service' do
-        is_expected.to contain_service('aodh-notifier').with(
-          :ensure     => nil,
-          :name       => platform_params[:notifier_service_name],
-          :enable     => false,
-          :hasstatus  => true,
-          :hasrestart => true,
-          :tag        => 'aodh-service',
-        )
+      it 'should not configure aodh-notifier service' do
+        is_expected.to_not contain_service('aodh-notifier')
       end
     end
   end