aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2017-07-24 19:22:15 +0300
committerEmilien Macchi <emilien@redhat.com>2017-07-26 03:59:20 +0000
commitea79aff996dae9e0dcaf756193f3e103e23bab48 (patch)
treeb66c0c348c62b183fbe236ae547cba781499a5ed /manifests
parentbf5eaa2fa243b9f3a1e329ea60ad23e12af41f1c (diff)
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
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/gnocchi/api.pp2
1 files changed, 1 insertions, 1 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 3953f04..ef29b8a 100644
--- 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
}
}