aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-15 02:54:56 +0000
committerGerrit Code Review <review@openstack.org>2017-04-15 02:54:56 +0000
commit826a2361db73771e1c25094353d322ce615f1db5 (patch)
treeef79ee79da4c8042fddfaaad41efd3d0cdbc2db8 /manifests
parentc17519c6afa7011785d8df62d9d951a6c62df677 (diff)
parent9de4c92571fdbe342a20a68e4ee44feb55464007 (diff)
Merge "Move gnocchi wsgi configuration to step 3"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/base/gnocchi/api.pp4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp
index 79ee265..ce04abf 100644
--- a/manifests/profile/base/gnocchi/api.pp
+++ b/manifests/profile/base/gnocchi/api.pp
@@ -83,13 +83,15 @@ class tripleo::profile::base::gnocchi::api (
include ::gnocchi::db::sync
}
- if $step >= 4 {
+ if $step >= 3 {
include ::gnocchi::api
class { '::gnocchi::wsgi::apache':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
}
+ }
+ if $step >= 4 {
class { '::gnocchi::storage':
coordination_url => join(['redis://:', hiera('gnocchi_redis_password'), '@', normalize_ip_for_uri(hiera('redis_vip')), ':6379/']),
}