From 159939c7462421e00da50bfe14a4207adfb2a951 Mon Sep 17 00:00:00 2001
From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Wed, 16 Aug 2017 10:43:15 +0300
Subject: [PATCH] Make swift's endpoint type configurable for gnocchi storage

It currently takes the default which is problematic for some
network isolated deployments.

Change-Id: I908b0e4f20f4b9f88a13fa52689d45946a2af27c
Closes-Bug: #1711063
---
 puppet/services/gnocchi-base.yaml                           | 6 ++++++
 ...storage-endpoint-type-configurable-718be8645b7ab3a0.yaml | 5 +++++
 2 files changed, 11 insertions(+)
 create mode 100644 releasenotes/notes/Make-gnocchis-swift-storage-endpoint-type-configurable-718be8645b7ab3a0.yaml

diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml
index 7f64e97b0e..4626e0d77a 100644
--- a/puppet/services/gnocchi-base.yaml
+++ b/puppet/services/gnocchi-base.yaml
@@ -64,6 +64,11 @@ parameters:
     default: ''
     description: Set to True to enable debugging Gnocchi services.
     type: string
+  GnocchiStorageSwiftEndpointType:
+    default: 'internalURL'
+    description: Set to modify which endpoint type is gnocchi accessing swift
+                 from.
+    type: string
 
 conditions:
   service_debug_unset: {equals : [{get_param: GnocchiDebug}, '']}
@@ -105,6 +110,7 @@ outputs:
         gnocchi::storage::swift::swift_auth_version: 3
         gnocchi::storage::swift::swift_key: {get_param: GnocchiPassword}
         gnocchi::storage::swift::swift_authurl: {get_param: [EndpointMap, KeystoneV3Internal, uri]}
+        gnocchi::storage::swift::swift_endpoint_type: {get_param: GnocchiStorageSwiftEndpointType}
         gnocchi::storage::ceph::ceph_pool: {get_param: GnocchiRbdPoolName}
         gnocchi::storage::ceph::ceph_username: {get_param: CephClientUserName}
         gnocchi::storage::ceph::ceph_keyring:
diff --git a/releasenotes/notes/Make-gnocchis-swift-storage-endpoint-type-configurable-718be8645b7ab3a0.yaml b/releasenotes/notes/Make-gnocchis-swift-storage-endpoint-type-configurable-718be8645b7ab3a0.yaml
new file mode 100644
index 0000000000..7c4e65aac0
--- /dev/null
+++ b/releasenotes/notes/Make-gnocchis-swift-storage-endpoint-type-configurable-718be8645b7ab3a0.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    This exposes the GnocchiStorageSwiftEndpointType parameter, which sets the
+    interface type that gnocchi will use to get the swift endpoint.