From c89d7182483e580d702268a07f66d9966df973fd Mon Sep 17 00:00:00 2001 From: Teresa Ho Date: Fri, 12 Jul 2019 13:37:53 -0400 Subject: [PATCH] Fix secret tls for placement helm chart When HTTPS is enabled, the public endpoint of placement service is set with https and fqdn. The placement helm chart would fail to apply. This commit is to correct the syntax of the secret tls section in the values.yaml and secret-ingress-tls.yaml. Upstream (openstack-helm) review: https://review.opendev.org/#/c/662229 Partial-Bug: 1826583 Change-Id: I64e7c1ff1972b0640145d18cafe2ea4e505db465 Signed-off-by: Teresa Ho --- openstack-helm/files/0015-Add-Placement-Chart.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openstack-helm/files/0015-Add-Placement-Chart.patch b/openstack-helm/files/0015-Add-Placement-Chart.patch index 0ff62feb..e0b96153 100644 --- a/openstack-helm/files/0015-Add-Placement-Chart.patch +++ b/openstack-helm/files/0015-Add-Placement-Chart.patch @@ -610,7 +610,7 @@ index 0000000..3413b5b +*/}} + +{{- if .Values.manifests.secret_ingress_tls }} -+{{ include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendService" "placement" "backendServiceType" "placement" ) }} ++{{ include "helm-toolkit.manifests.secret_ingress_tls" ( dict "envAll" . "backendServiceType" "placement" ) }} +{{- end }} diff --git a/placement/templates/secret-keystone.yaml b/placement/templates/secret-keystone.yaml new file mode 100644 @@ -1041,7 +1041,7 @@ index 0000000..33139f0 + placement: placement-db-user + tls: + placement: -+ placement: ++ api: + public: placement-tls-public + +dependencies: