openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Fix gnocchi auth mode to basic 

There is no auth mode called simple. Fix the mode to
basic so it gets set corretcly when configured in
collectd.

Depends-On: I05632137ed12c59a41a5219189c431983935d461

Change-Id: I2561a35c54e0137f5420de4403e5e20dd08afd28
This commit is contained in:
Pradeep Kilambi 2018-06-18 15:49:41 -04:00
parent 8a5b3c8596
commit ddcca3c64b
1 changed files with 4 additions and 4 deletions
Show Stats 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
description: >
Type of authentication Gnocchi server is using. Supported values are
'simple' and 'keystone'.
'basic' and 'keystone'.
default: 'keystone'
CollectdGnocchiProtocol:
type: string
@ -208,8 +208,8 @@ conditions:
collectd_connection:
not:
equals: [{get_param: CollectdServer}, '']
gnocchi_auth_simple:
equals: [{get_param: CollectdGnocchiAuthMode}, 'simple']
gnocchi_auth_basic:
equals: [{get_param: CollectdGnocchiAuthMode}, 'basic']
outputs:
role_data:
@ -268,7 +268,7 @@ outputs:
tripleo::profile::base::metrics::collectd::gnocchi_keystone_region_name:
get_param: KeystoneRegion
- 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:
get_param: CollectdGnocchiProtocol
tripleo::profile::base::metrics::collectd::gnocchi_server: