openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix gnocchi auth mode to basic"

Browse Source
This commit is contained in:
Zuul
2018-07-03 12:37:46 +00:00
committed by Gerrit Code Review
parent 9f1d855627 ddcca3c64b
commit de62fe3844
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
puppet/services/metrics/collectd.yaml
View File

@@ -112,7 +112,7 @@ parameters:
type: string type: string
description: > description: >
Type of authentication Gnocchi server is using. Supported values are Type of authentication Gnocchi server is using. Supported values are
'simple' and 'keystone'. 'basic' and 'keystone'.
default: 'keystone' default: 'keystone'
CollectdGnocchiProtocol: CollectdGnocchiProtocol:
type: string type: string
@@ -208,8 +208,8 @@ conditions:
collectd_connection: collectd_connection:
not: not:
equals: [{get_param: CollectdServer}, ''] equals: [{get_param: CollectdServer}, '']
gnocchi_auth_simple: gnocchi_auth_basic:
equals: [{get_param: CollectdGnocchiAuthMode}, 'simple'] equals: [{get_param: CollectdGnocchiAuthMode}, 'basic']
outputs: outputs:
role_data: role_data:
@@ -268,7 +268,7 @@ outputs:
tripleo::profile::base::metrics::collectd::gnocchi_keystone_region_name: tripleo::profile::base::metrics::collectd::gnocchi_keystone_region_name:
get_param: KeystoneRegion get_param: KeystoneRegion
- if: - if:
- gnocchi_auth_simple # use simple auth or keystone auth? - gnocchi_auth_basic # use basic auth or keystone auth?
- tripleo::profile::base::metrics::collectd::gnocchi_protocol: - tripleo::profile::base::metrics::collectd::gnocchi_protocol:
get_param: CollectdGnocchiProtocol get_param: CollectdGnocchiProtocol
tripleo::profile::base::metrics::collectd::gnocchi_server: tripleo::profile::base::metrics::collectd::gnocchi_server: