Merge "Refactor api service management"

manifests/api.pp

@@ -155,16 +155,32 @@ class cinder::api (
   }
 
   if $manage_service {
-    if $enabled {
+    case $service_name {
-      $ensure = 'running'
+      'httpd': {
-    } else {
+        Service <| title == 'httpd' |> { tag +> 'cinder-service' }
-      $ensure = 'stopped'
+
+        service { 'cinder-api':
+          ensure => 'stopped',
+          name   => $cinder::params::api_service,
+          enable => false,
+          tag    => ['cinder-service'],
+        }
+
+        # we need to make sure cinder-api/eventlet is stopped before trying to start apache
+        Service['cinder-api'] -> Service['httpd']
+
+        # On any api-paste.ini config change, we must restart Cinder API.
+        Cinder_api_paste_ini<||> ~> Service['httpd']
+      }
+      default: {
+        $service_ensure = $enabled ? {
+          true    => 'running',
+          default => 'stopped',
         }
 
-    if $service_name == $cinder::params::api_service {
         service { 'cinder-api':
-        ensure    => $ensure,
+          ensure    => $service_ensure,
-        name      => $cinder::params::api_service,
+          name      => $service_name,
           enable    => $enabled,
           hasstatus => true,
           tag       => 'cinder-service',
@@ -174,23 +190,7 @@ class cinder::api (
         Cinder_api_paste_ini<||> ~> Service['cinder-api']
         # On any uwsgi config change, we must restart Cinder API.
         Cinder_api_uwsgi_config<||> ~> Service['cinder-api']
-    } elsif $service_name == 'httpd' {
-      service { 'cinder-api':
-        ensure => 'stopped',
-        name   => $cinder::params::api_service,
-        enable => false,
-        tag    => ['cinder-service'],
       }
-      Service <| title == 'httpd' |> { tag +> 'cinder-service' }
-
-      # we need to make sure cinder-api/eventlet is stopped before trying to start apache
-      Service['cinder-api'] -> Service[$service_name]
-
-      # On any api-paste.ini config change, we must restart Cinder API.
-      Cinder_api_paste_ini<||> ~> Service[$service_name]
-    } else {
-      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")
     }
   }
 

spec/classes/cinder_api_spec.rb

@@ -174,22 +174,6 @@ describe 'cinder::api' do
       end
     end
 
-    context 'when service_name is not valid' do
-      let :params do
-        req_params.merge!({ :service_name => 'foobar' })
-      end
-
-      let :pre_condition do
-        "include apache
-         class { 'cinder': }
-         class { 'cinder::keystone::authtoken':
-           password => 'foo',
-         }"
-      end
-
-      it_raises 'a Puppet::Error', /Invalid service_name/
-    end
-
     context 'with SSL socket options set' do
       let :params do
         req_params.merge!({