From d0a42cfc7ade65997038317a73731bc36dd77eef Mon Sep 17 00:00:00 2001
From: Anthony Lin <anthony.jclin@gmail.com>
Date: Thu, 8 Feb 2018 07:24:32 +0000
Subject: [PATCH] Bug Fix - DeckHand/Barbican URI Lookup

We are getting the following error [1] in Armada after [0]
was merged due to missing values in values.yaml

This patch set is meant to correct that

[0] https://review.gerrithub.io/#/c/398810/

[1] Error Messages

2018-02-08 07:02:54.481 1 ERROR armada grpc._channel._Rendezvous: <_Rendezvous of RPC that terminated with (StatusCode.UNKNOWN, render error in "deckhand/deployment.yaml": template: deckhand/deployment.yaml:36:62: executing "deckhand/deployment.yaml" at <include "helm-toolki...>: error calling include: template: deckhand/charts/helm-toolkit/utils/_hash.tpl:22:4: executing "helm-toolkit.utils.hash" at <include $wtf $contex...>: error calling include: template: deckhand/configmap-etc.yaml:37:20: executing "deckhand/configmap-etc.yaml" at <.Values.conf.deckhan...>: can't evaluate field api_endpoint in type interface {})>

Change-Id: Ie0aad8c2668924589fbad8865c973d86cb8779f7
---
 charts/deckhand/templates/configmap-etc.yaml | 4 ++--
 charts/deckhand/values.yaml                  | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/charts/deckhand/templates/configmap-etc.yaml b/charts/deckhand/templates/configmap-etc.yaml
index 41898dd5..b019680c 100644
--- a/charts/deckhand/templates/configmap-etc.yaml
+++ b/charts/deckhand/templates/configmap-etc.yaml
@@ -20,12 +20,12 @@
 
 # FIXME fix for broken keystonemiddleware oslo config gen in newton - will remove in future
 {{- if empty .Values.conf.deckhand.keystone_authtoken.auth_url -}}
-{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup"| set .Values.conf.deckhand.keystone_authtoken "auth_url" | quote | trunc 0 -}}
+{{- tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" | set .Values.conf.deckhand.keystone_authtoken "auth_url" | quote | trunc 0 -}}
 {{- end -}}
 
 # Add endpoint URI lookup for Deckhand Postgresql DB Connection
 {{- if empty .Values.conf.deckhand.database.connection -}}
-{{- tuple "postgresql" "internal" "user" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.deckhand.database "connection" | quote | trunc 0 -}}
+{{- tuple "postgresql" "internal" "user" "postgresql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.deckhand.database "connection" | quote | trunc 0 -}}
 {{- end -}}
 
 # Add endpoint URI lookup for memcached servers Connection
diff --git a/charts/deckhand/values.yaml b/charts/deckhand/values.yaml
index 7d38ac84..d3c40dcf 100644
--- a/charts/deckhand/values.yaml
+++ b/charts/deckhand/values.yaml
@@ -226,6 +226,8 @@ conf:
       policy_file: policy.yaml
       policy_default_rule: default
       policy_dirs: policy.d
+    barbican:
+      api_endpoint:
   logging:
     loggers:
       keys: 'root, deckhand, error'