diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-25 13:34:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-25 13:34:50 +0000 |
| commit | d3987432f90c1f7c190d94385ad2525fa00ae1d6 (patch) | |
| tree | 85ea20505e0e4510be1640c23e87c7db2d1d7a64 /manifests/profile/base | |
| parent | b0b8b5933a160246efe5ec96b074bddbce33b16c (diff) | |
| parent | 243e3bdc20a5e5d21c828d0727c898ee7de9a05b (diff) | |
Merge "Move gnocchi wsgi configuration to step 3" into stable/ocata
Diffstat (limited to 'manifests/profile/base')
| -rw-r--r-- | manifests/profile/base/gnocchi/api.pp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/manifests/profile/base/gnocchi/api.pp b/manifests/profile/base/gnocchi/api.pp index 92431e4..029eb99 100644 --- a/manifests/profile/base/gnocchi/api.pp +++ b/manifests/profile/base/gnocchi/api.pp @@ -96,14 +96,16 @@ class tripleo::profile::base::gnocchi::api ( include ::gnocchi::db::sync } - if $step >= 4 { + if $step >= 3 { include ::gnocchi::api include ::apache::mod::ssl 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/']), } |