summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-27 13:36:15 +0000
committerGerrit Code Review <review@openstack.org>2017-07-27 13:36:15 +0000
commitab8167978569041e79fd9edbfd66359b528116cd (patch)
tree47d293ad84e2ff0f97fdafdc8df92e1e63546931
parent7ff70f8094a51cae422c77b7f85ebbcba72d43f6 (diff)
parentea79aff996dae9e0dcaf756193f3e103e23bab48 (diff)
Merge "Move gnocchi::api resource to run with wsgi setup"
-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 a9f2955..88177fd 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,
@@ -124,7 +125,6 @@ class tripleo::profile::base::gnocchi::api (
'rbd': { include ::gnocchi::storage::ceph }
default: { fail('Unrecognized gnocchi_backend parameter.') }
}
- include ::gnocchi::api
}
}