From c8a4e3cb2b7d7b6ef6a6aa569d1f9fda68b26e34 Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <daniel.pawlik@corp.ovh.com>
Date: Tue, 10 Oct 2017 14:09:50 +0000
Subject: [PATCH] Added OS_AUTH_TYPE parameter to auth file

Some services like Gnocchi can not get proper endpoint from
Keystone service.
Exporting variable: OS_AUTH_TYPE with value 'password'
will fix the problem.

Change-Id: I96aa50f152297dd406c505de1305fe6c796e7f96
---
 manifests/auth_file.pp | 5 +++++
 templates/openrc.erb   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/manifests/auth_file.pp b/manifests/auth_file.pp
index e16081a..85568d5 100644
--- a/manifests/auth_file.pp
+++ b/manifests/auth_file.pp
@@ -81,6 +81,10 @@
 #   (optional) User domain in v3 api.
 #   Defaults to 'default'.
 #
+# [*auth_type*]
+#   (optional) Authentication type to load.
+#   Default to undef.
+#
 # [*identity_api_version*]
 #   (optional) Identity API version to use.
 #   Defaults to '3'.
@@ -98,6 +102,7 @@ class openstack_extras::auth_file(
   $use_no_cache             = true,
   $project_domain           = 'default',
   $user_domain              = 'default',
+  $auth_type                = undef,
   $cinder_endpoint_type     = 'publicURL',
   $glance_endpoint_type     = 'publicURL',
   $keystone_endpoint_type   = 'publicURL',
diff --git a/templates/openrc.erb b/templates/openrc.erb
index e8fc5e5..66d75da 100644
--- a/templates/openrc.erb
+++ b/templates/openrc.erb
@@ -21,6 +21,9 @@ export OS_PROJECT_DOMAIN_NAME='<%= @project_domain %>'
 <% if @user_domain -%>
 export OS_USER_DOMAIN_NAME='<%= @user_domain %>'
 <% end -%>
+<% if @auth_type -%>
+export OS_AUTH_TYPE='<%= @auth_type %>'
+<% end -%>
 export CINDER_ENDPOINT_TYPE='<%= @cinder_endpoint_type %>'
 export GLANCE_ENDPOINT_TYPE='<%= @glance_endpoint_type %>'
 export KEYSTONE_ENDPOINT_TYPE='<%= @keystone_endpoint_type %>'