openstack/puppet-tripleo
Code Issues Proposed changes

Fix default value for Gnocchi auth mode

Browse Source 
The correct values or auth modes for Gnocchi are 'basic' and 'keystone'.
This patch fixes the 'simple' usage to 'basic'. Note that without this rename
the deployment works because when 'simple' is used the parameter is not used
in config file, so value 'basic' is used by python-collectd-gnocchi, because
it is implicit default.

Change-Id: I05632137ed12c59a41a5219189c431983935d461
This commit is contained in:
Martin Mágr 2018-06-19 12:06:44 +02:00
parent 1e9385eaa2
commit 1082bde8e8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/profile/base/metrics/collectd.pp
View File

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

6
manifests/profile/base/metrics/collectd/gnocchi.pp
View File

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

2
templates/collectd/collectd-gnocchi.conf.erb
View File

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