openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Fix default value for Gnocchi auth mode"

Browse Source
This commit is contained in:
Zuul
2018-06-20 17:00:25 +00:00
committed by Gerrit Code Review
parent cab0d34aff 1082bde8e8
commit b9a9ca9b31
3 changed files with 7 additions and 7 deletions
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 %>