From 64db30f9348c4b07ad20055946c318c87a6912aa Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Sun, 9 Jul 2017 20:59:56 -0500
Subject: [PATCH] Configmaps: remove domain user script from charts that dont
use it
This PS removes the domain user script from charts that do not
require it to be present or make use of it.
Change-Id: Ibce0bda7b6347ebfdc84459776b98431504c7b5b
---
barbican/templates/configmap-bin.yaml | 2 --
magnum/templates/configmap-bin.yaml | 2 --
mistral/templates/configmap-bin.yaml | 2 --
senlin/templates/configmap-bin.yaml | 2 --
4 files changed, 8 deletions(-)
diff --git a/barbican/templates/configmap-bin.yaml b/barbican/templates/configmap-bin.yaml
index 4d2f2c2ac0..29b952b1bc 100644
--- a/barbican/templates/configmap-bin.yaml
+++ b/barbican/templates/configmap-bin.yaml
@@ -29,5 +29,3 @@ data:
{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
ks-user.sh: |
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
- ks-domain-user.sh: |
-{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }}
diff --git a/magnum/templates/configmap-bin.yaml b/magnum/templates/configmap-bin.yaml
index 1551a8b7ea..cbb2afbd43 100644
--- a/magnum/templates/configmap-bin.yaml
+++ b/magnum/templates/configmap-bin.yaml
@@ -29,8 +29,6 @@ data:
{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
ks-user.sh: |+
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
- ks-domain-user.sh: |+
-{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }}
magnum-api.sh: |
{{ tuple "bin/_magnum-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
magnum-conductor.sh: |
diff --git a/mistral/templates/configmap-bin.yaml b/mistral/templates/configmap-bin.yaml
index 66d6804647..498c08b323 100644
--- a/mistral/templates/configmap-bin.yaml
+++ b/mistral/templates/configmap-bin.yaml
@@ -29,8 +29,6 @@ data:
{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
ks-user.sh: |+
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
- ks-domain-user.sh: |+
-{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }}
mistral-api.sh: |
{{ tuple "bin/_mistral-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
mistral-engine.sh: |
diff --git a/senlin/templates/configmap-bin.yaml b/senlin/templates/configmap-bin.yaml
index 18626df0bf..bff03c7666 100644
--- a/senlin/templates/configmap-bin.yaml
+++ b/senlin/templates/configmap-bin.yaml
@@ -29,8 +29,6 @@ data:
{{- include "helm-toolkit.scripts.keystone_endpoints" . | indent 4 }}
ks-user.sh: |+
{{- include "helm-toolkit.scripts.keystone_user" . | indent 4 }}
- ks-domain-user.sh: |+
-{{- include "helm-toolkit.scripts.keystone_domain_user" . | indent 4 }}
senlin-api.sh: |
{{ tuple "bin/_senlin-api.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }}
senlin-engine.sh: |