Move gnocchi::api resource to run with wsgi setup

Having this run in step 4 causes a refresh (restart) for httpd, which
in turn is problematic for the gnocchi db upgrade command, since when
it runs httpd is not available at that point. This fixes the issue,
since the API configuration is now ran at the same time as the wsgi
bits.

Change-Id: Ie0ab389a4450bb940757e34d1964423911885fa3

diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 3953f04..ef29b8a 100644 (file)
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -94,6 +94,7 @@ class tripleo::profile::base::gnocchi::api (
   }
 
   if $step >= 4 or ($step >= 3 and $sync_db) {
+    include ::gnocchi::api
     include ::apache::mod::ssl
     class { '::gnocchi::wsgi::apache':
       ssl_cert => $tls_certfile,
@@ -119,7 +120,6 @@ class tripleo::profile::base::gnocchi::api (
       'rbd': { include ::gnocchi::storage::ceph }
       default: { fail('Unrecognized gnocchi_backend parameter.') }
     }
-    include ::gnocchi::api
   }
 
 }