From 1082bde8e8dbe0739510a47a1af8ab56babe51bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=A1gr?= <mmagr@redhat.com>
Date: Tue, 19 Jun 2018 12:06:44 +0200
Subject: [PATCH] Fix default value for Gnocchi auth mode

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
---
 manifests/profile/base/metrics/collectd.pp         | 6 +++---
 manifests/profile/base/metrics/collectd/gnocchi.pp | 6 +++---
 templates/collectd/collectd-gnocchi.conf.erb       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/profile/base/metrics/collectd.pp b/manifests/profile/base/metrics/collectd.pp
index 8278c4527..38ad82ccd 100644
--- a/manifests/profile/base/metrics/collectd.pp
+++ b/manifests/profile/base/metrics/collectd.pp
@@ -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,
diff --git a/manifests/profile/base/metrics/collectd/gnocchi.pp b/manifests/profile/base/metrics/collectd/gnocchi.pp
index c4a0fd2e3..4a6253f3a 100644
--- a/manifests/profile/base/metrics/collectd/gnocchi.pp
+++ b/manifests/profile/base/metrics/collectd/gnocchi.pp
@@ -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,
diff --git a/templates/collectd/collectd-gnocchi.conf.erb b/templates/collectd/collectd-gnocchi.conf.erb
index 4dd3d33ca..a0aab160a 100644
--- a/templates/collectd/collectd-gnocchi.conf.erb
+++ b/templates/collectd/collectd-gnocchi.conf.erb
@@ -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 %>