Merge "Fix default value for Gnocchi auth mode"

This commit is contained in:
Zuul 2018-06-20 17:00:25 +00:00 committed by Gerrit Code Review
commit b9a9ca9b31
3 changed files with 7 additions and 7 deletions

View File

@ -49,8 +49,8 @@
#
# [*gnocchi_auth_mode*]
# (Optional) String. Type of authentication Gnocchi server is using.
# Supported values are 'simple' and 'keystone'.
# Defaults to 'simple'
# Supported values are 'basic' and 'keystone'.
# Defaults to 'basic'
#
# [*gnocchi_protocol*]
# (Optional) String. API protocol Gnocchi server is using.
@ -151,7 +151,7 @@ class tripleo::profile::base::metrics::collectd (
$collectd_username = undef,
$collectd_password = undef,
$collectd_securitylevel = undef,
$gnocchi_auth_mode = 'simple',
$gnocchi_auth_mode = 'basic',
$gnocchi_protocol = 'http',
$gnocchi_server = undef,
$gnocchi_port = 8041,

View File

@ -29,8 +29,8 @@
#
# [*auth_mode*]
# (Optional) String. Type of authentication Gnocchi server is using.
# Supported values are 'simple' and 'keystone'.
# Defaults to 'simple'
# Supported values are 'basic' and 'keystone'.
# Defaults to 'basic'
#
# [*protocol*]
# (Optional) String. API protocol Gnocchi server is using.
@ -116,7 +116,7 @@
define tripleo::profile::base::metrics::collectd::gnocchi (
$ensure = 'present',
$order = '00',
$auth_mode = 'simple',
$auth_mode = 'basic',
$protocol = 'http',
$server = undef,
$port = undef,

View File

@ -1,7 +1,7 @@
<Plugin "python">
Import "collectd_gnocchi"
<Module "collectd_gnocchi">
<%- if @auth_mode == 'simple' %>
<%- if @auth_mode == 'basic' %>
### Basic authentication
Endpoint "<%= @protocol %>://<%= @server %>:<%= @port %>"
<%- if @user %>