From b0f3b80efcea04529ad1589d3542298adf0ba8f6 Mon Sep 17 00:00:00 2001 From: Robert Church Date: Wed, 14 Nov 2018 00:49:40 -0500 Subject: [PATCH] Rebase openstack-helm and openstack-helm-infra Rebase to a current version of the upstream repos. This will retire the reverted commits that we needed to enable per host overrides as this was fixed upstream. Change-Id: Iacbdd666687b8bc12053f9d3dd833f9896a508cd Depends-On: Iedb814ce0c72a59ab0ce5e72e4601082b61f82b0 Story: 2003909 Task: 27632 Signed-off-by: Robert Church --- .../centos/build_srpm.data | 4 +- .../centos/openstack-helm-infra.spec | 6 +- ...nocchi-upgrade-option-and-set-coordi.patch | 6 +- ...kit-Move-sensitive-config-data-to-se.patch | 140 -- ...hi-use-of-k8s-secret-to-store-config.patch | 144 -- .../openstack-helm/centos/build_srpm.data | 4 +- .../openstack-helm/centos/openstack-helm.spec | 12 +- ...Neutron-TaaS-support-as-L2-Extension.patch | 334 --- ...ch => 0001-ceilometer-chart-updates.patch} | 59 +- ...-Chart.patch => 0002-Add-Aodh-Chart.patch} | 76 +- ...stack-Use-k8s-secret-to-store-config.patch | 1811 ----------------- ...Chart.patch => 0003-Add-Panko-Chart.patch} | 60 +- 12 files changed, 109 insertions(+), 2547 deletions(-) delete mode 100644 openstack/openstack-helm-infra/files/0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch delete mode 100644 openstack/openstack-helm-infra/files/0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch delete mode 100644 openstack/openstack-helm/files/0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch rename openstack/openstack-helm/files/{0003-ceilometer-chart-updates.patch => 0001-ceilometer-chart-updates.patch} (98%) rename openstack/openstack-helm/files/{0004-Add-Aodh-Chart.patch => 0002-Add-Aodh-Chart.patch} (98%) delete mode 100644 openstack/openstack-helm/files/0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch rename openstack/openstack-helm/files/{0005-Add-Panko-Chart.patch => 0003-Add-Panko-Chart.patch} (98%) diff --git a/openstack/openstack-helm-infra/centos/build_srpm.data b/openstack/openstack-helm-infra/centos/build_srpm.data index 9eac3ec4..17a6d472 100644 --- a/openstack/openstack-helm-infra/centos/build_srpm.data +++ b/openstack/openstack-helm-infra/centos/build_srpm.data @@ -1,8 +1,8 @@ TAR_NAME=openstack-helm-infra -SHA=5ec85a5d70fab468160d2fdafed1a2a7a5151405 +SHA=5d356f9265b337b75f605dee839faa8cd0ed3ab2 VERSION=1.0.0 TAR="$TAR_NAME-$SHA.tar.gz" COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/*" -TIS_PATCH_VER=3 +TIS_PATCH_VER=4 diff --git a/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec b/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec index 9b152498..6c8c8be2 100644 --- a/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec +++ b/openstack/openstack-helm-infra/centos/openstack-helm-infra.spec @@ -1,4 +1,4 @@ -%global sha 5ec85a5d70fab468160d2fdafed1a2a7a5151405 +%global sha 5d356f9265b337b75f605dee839faa8cd0ed3ab2 %global helm_folder /usr/lib/helm Summary: Openstack-Helm-Infra charts @@ -15,8 +15,6 @@ Source0: %{name}-%{sha}.tar.gz BuildArch: noarch Patch01: 0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch -Patch02: 0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch -Patch03: 0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch BuildRequires: helm @@ -26,8 +24,6 @@ Openstack Helm Infra charts %prep %setup -n openstack-helm-infra %patch01 -p1 -%patch02 -p1 -%patch03 -p1 %build # initialize helm and build the toolkit diff --git a/openstack/openstack-helm-infra/files/0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch b/openstack/openstack-helm-infra/files/0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch index d019eab9..9e74801b 100644 --- a/openstack/openstack-helm-infra/files/0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch +++ b/openstack/openstack-helm-infra/files/0001-gnocchi-remove-gnocchi-upgrade-option-and-set-coordi.patch @@ -1,7 +1,7 @@ -From 5d78a8df854340225c32d025e921efd5c9dc2be1 Mon Sep 17 00:00:00 2001 +From c699219876325fb01c23a4d240f9ecf6f145cd5a Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Wed, 26 Sep 2018 17:01:28 +0000 -Subject: [PATCH 1/3] gnocchi: remove gnocchi upgrade option and set +Subject: [PATCH] gnocchi: remove gnocchi upgrade option and set coordination_url - Remove the gnocchi upgrade option "--create-legacy-resource-types" as @@ -40,5 +40,5 @@ index 83d3f14..bdf6acc 100644 {{- $_ := tuple "oslo_db" "internal" "gnocchi" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup" | set .Values.conf.gnocchi.database "connection" -}} {{- end -}} -- -1.8.3.1 +2.18.0 diff --git a/openstack/openstack-helm-infra/files/0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch b/openstack/openstack-helm-infra/files/0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch deleted file mode 100644 index 6afb0314..00000000 --- a/openstack/openstack-helm-infra/files/0002-Revert-Helm-Toolkit-Move-sensitive-config-data-to-se.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 82c8a765764c034365ba487b3abbd1da542b0a4c Mon Sep 17 00:00:00 2001 -From: Gerry Kopec -Date: Tue, 2 Oct 2018 17:11:54 +0000 -Subject: [PATCH 2/3] Revert "Helm-Toolkit: Move sensitive config data to - secrets." - -This reverts commit 6186fb6675d57235c22b88d9b3b2215d4c06b082. - -Conflicts: - .zuul.yaml - -To allow per host overrides to work we need to temporarily revert this -commit. This should be put back once upstream has fixed the issue: -https://storyboard.openstack.org/#!/story/2003873 ---- - helm-toolkit/templates/manifests/_job-bootstrap.yaml | 4 ++-- - .../templates/manifests/_job-db-drop-mysql.yaml.tpl | 4 ++-- - .../templates/manifests/_job-db-init-mysql.yaml.tpl | 4 ++-- - helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl | 4 ++-- - .../templates/snippets/_values_template_renderer.tpl | 14 ++------------ - ldap/templates/configmap-etc.yaml | 7 +++---- - 6 files changed, 13 insertions(+), 24 deletions(-) - -diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.yaml b/helm-toolkit/templates/manifests/_job-bootstrap.yaml -index 8afc50e..a3276d5 100644 ---- a/helm-toolkit/templates/manifests/_job-bootstrap.yaml -+++ b/helm-toolkit/templates/manifests/_job-bootstrap.yaml -@@ -92,8 +92,8 @@ spec: - - name: etc-service - emptyDir: {} - - name: bootstrap-conf -- secret: -- secretName: {{ $configMapEtc | quote }} -+ configMap: -+ name: {{ $configMapEtc | quote }} - defaultMode: 0444 - {{- if $podVols }} - {{ $podVols | toYaml | indent 8 }} -diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl -index e813c32..27b347a 100644 ---- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl -+++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl -@@ -118,8 +118,8 @@ spec: - - name: etc-service - emptyDir: {} - - name: db-drop-conf -- secret: -- secretName: {{ $configMapEtc | quote }} -+ configMap: -+ name: {{ $configMapEtc | quote }} - defaultMode: 0444 - {{- end -}} - {{- end -}} -diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl -index dea5864..8e7e436 100644 ---- a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl -+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl -@@ -115,8 +115,8 @@ spec: - - name: etc-service - emptyDir: {} - - name: db-init-conf -- secret: -- secretName: {{ $configMapEtc | quote }} -+ configMap: -+ name: {{ $configMapEtc | quote }} - defaultMode: 0444 - {{- end -}} - {{- end -}} -diff --git a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl -index 134e99b..df64ecf 100644 ---- a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl -+++ b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl -@@ -88,8 +88,8 @@ spec: - - name: etc-service - emptyDir: {} - - name: db-sync-conf -- secret: -- secretName: {{ $configMapEtc | quote }} -+ configMap: -+ name: {{ $configMapEtc | quote }} - defaultMode: 0444 - {{- if $podVols }} - {{ $podVols | toYaml | indent 8 }} -diff --git a/helm-toolkit/templates/snippets/_values_template_renderer.tpl b/helm-toolkit/templates/snippets/_values_template_renderer.tpl -index 88a279d..67f099d 100644 ---- a/helm-toolkit/templates/snippets/_values_template_renderer.tpl -+++ b/helm-toolkit/templates/snippets/_values_template_renderer.tpl -@@ -67,23 +67,13 @@ return: | - {{- $envAll := index . "envAll" -}} - {{- $template := index . "template" -}} - {{- $key := index . "key" -}} --{{- $format := index . "format" | default "configMap" -}} - {{- with $envAll -}} - {{- $templateRendered := tpl ( $template | toYaml ) . }} --{{- if eq $format "Secret" }} --{{- if hasPrefix "|\n" $templateRendered }} --{{ $key }}: {{ regexReplaceAllLiteral "\n " ( $templateRendered | trimPrefix "|\n" | trimPrefix " " ) "\n" | b64enc }} --{{- else }} --{{ $key }}: {{ $templateRendered | b64enc }} --{{- end -}} --{{- else }} --{{- if hasPrefix "|\n" $templateRendered }} --{{ $key }}: | --{{ regexReplaceAllLiteral "\n " ( $templateRendered | trimPrefix "|\n" | trimPrefix " " ) "\n" | indent 2 }} -+{{- if hasPrefix "|\n" $templateRendered }} -+{{ $key }}: {{ $templateRendered }} - {{- else }} - {{ $key }}: | - {{ $templateRendered | indent 2 }} - {{- end -}} - {{- end -}} - {{- end -}} --{{- end -}} -diff --git a/ldap/templates/configmap-etc.yaml b/ldap/templates/configmap-etc.yaml -index 3fa7c37..e724e6d 100644 ---- a/ldap/templates/configmap-etc.yaml -+++ b/ldap/templates/configmap-etc.yaml -@@ -13,16 +13,15 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - */}} -- - {{- if .Values.manifests.configmap_etc }} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: ldap-etc --type: Opaque - data: - {{- if .Values.bootstrap.enabled }} -- sample_data.ldif: {{ .Values.data.sample | b64enc }} -+ sample_data.ldif: | -+{{ .Values.data.sample | indent 4 }} - {{- end }} - {{- end }} --- -1.8.3.1 - diff --git a/openstack/openstack-helm-infra/files/0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch b/openstack/openstack-helm-infra/files/0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch deleted file mode 100644 index 048439d9..00000000 --- a/openstack/openstack-helm-infra/files/0003-Revert-gnocchi-use-of-k8s-secret-to-store-config.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 4c2dd3b4e64a898613106c82dddaffd5e5ab09a0 Mon Sep 17 00:00:00 2001 -From: Gerry Kopec -Date: Wed, 3 Oct 2018 22:32:13 +0000 -Subject: [PATCH 3/3] Revert gnocchi use of k8s secret to store config - -To allow per host overrides to work we need to temporarily revert secrets -related changes. In the original secrets commit: -83b91e6e Openstack: Use k8s secret to store config -gnocchi was in openstack-helm, but was subsequently moved to -openstack-helm-infra. This commit reverts the gnocchi specific changes. - -This commit should be put back once upstream has fixed the issue: -https://storyboard.openstack.org/#!/story/2003873 - -Reviewed by Angie. ---- - gnocchi/templates/configmap-etc.yaml | 14 ++++++++------ - gnocchi/templates/daemonset-metricd.yaml | 4 ++-- - gnocchi/templates/daemonset-statsd.yaml | 4 ++-- - gnocchi/templates/deployment-api.yaml | 4 ++-- - gnocchi/templates/job-db-init-indexer.yaml | 4 ++-- - gnocchi/templates/job-db-sync.yaml | 4 ++-- - gnocchi/templates/pod-gnocchi-test.yaml | 4 ++-- - 7 files changed, 20 insertions(+), 18 deletions(-) - -diff --git a/gnocchi/templates/configmap-etc.yaml b/gnocchi/templates/configmap-etc.yaml -index bdf6acc..eb2fd1f 100644 ---- a/gnocchi/templates/configmap-etc.yaml -+++ b/gnocchi/templates/configmap-etc.yaml -@@ -91,13 +91,15 @@ limitations under the License. - {{- $envAll := . }} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: gnocchi-etc --type: Opaque - data: -- gnocchi.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf" "format" "Secret" ) | indent 2 }} -+ gnocchi.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.gnocchi | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.apache "key" "wsgi-gnocchi.conf") | indent 2 }} - {{- end }} -diff --git a/gnocchi/templates/daemonset-metricd.yaml b/gnocchi/templates/daemonset-metricd.yaml -index ccd6b0f..057fb95 100644 ---- a/gnocchi/templates/daemonset-metricd.yaml -+++ b/gnocchi/templates/daemonset-metricd.yaml -@@ -98,8 +98,8 @@ spec: - - name: pod-etc-gnocchi - emptyDir: {} - - name: gnocchi-etc -- secret: -- secretName: gnocchi-etc -+ configMap: -+ name: gnocchi-etc - defaultMode: 0444 - - name: gnocchi-bin - configMap: -diff --git a/gnocchi/templates/daemonset-statsd.yaml b/gnocchi/templates/daemonset-statsd.yaml -index 343073e..9560a16 100644 ---- a/gnocchi/templates/daemonset-statsd.yaml -+++ b/gnocchi/templates/daemonset-statsd.yaml -@@ -104,8 +104,8 @@ spec: - - name: pod-etc-gnocchi - emptyDir: {} - - name: gnocchi-etc -- secret: -- secretName: gnocchi-etc -+ configMap: -+ name: gnocchi-etc - defaultMode: 0444 - - name: gnocchi-bin - configMap: -diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml -index 6425d46..b26a508 100644 ---- a/gnocchi/templates/deployment-api.yaml -+++ b/gnocchi/templates/deployment-api.yaml -@@ -123,8 +123,8 @@ spec: - - name: pod-etc-gnocchi - emptyDir: {} - - name: gnocchi-etc -- secret: -- secretName: gnocchi-etc -+ configMap: -+ name: gnocchi-etc - defaultMode: 0444 - - name: gnocchi-bin - configMap: -diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml -index ad47290..19abe9d 100644 ---- a/gnocchi/templates/job-db-init-indexer.yaml -+++ b/gnocchi/templates/job-db-init-indexer.yaml -@@ -66,8 +66,8 @@ spec: - readOnly: true - volumes: - - name: gnocchi-etc -- secret: -- secretName: gnocchi-etc -+ configMap: -+ name: gnocchi-etc - defaultMode: 0444 - - name: pod-etc-gnocchi - emptyDir: {} -diff --git a/gnocchi/templates/job-db-sync.yaml b/gnocchi/templates/job-db-sync.yaml -index bdb0f95..5ee99ae 100644 ---- a/gnocchi/templates/job-db-sync.yaml -+++ b/gnocchi/templates/job-db-sync.yaml -@@ -76,8 +76,8 @@ spec: - readOnly: true - volumes: - - name: gnocchi-etc -- secret: -- secretName: gnocchi-etc -+ configMap: -+ name: gnocchi-etc - defaultMode: 0444 - - name: gnocchi-bin - configMap: -diff --git a/gnocchi/templates/pod-gnocchi-test.yaml b/gnocchi/templates/pod-gnocchi-test.yaml -index df02983..2835c0e 100644 ---- a/gnocchi/templates/pod-gnocchi-test.yaml -+++ b/gnocchi/templates/pod-gnocchi-test.yaml -@@ -70,8 +70,8 @@ spec: - {{ if $mounts_gnocchi_tests.volumeMounts }}{{ toYaml $mounts_gnocchi_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: gnocchi-etc -- secret: -- secretName: gnocchi-etc -+ configMap: -+ name: gnocchi-etc - defaultMode: 0444 - - name: gnocchi-bin - configMap: --- -1.8.3.1 - diff --git a/openstack/openstack-helm/centos/build_srpm.data b/openstack/openstack-helm/centos/build_srpm.data index 35739351..ce206e94 100644 --- a/openstack/openstack-helm/centos/build_srpm.data +++ b/openstack/openstack-helm/centos/build_srpm.data @@ -1,8 +1,8 @@ TAR_NAME=openstack-helm -SHA=add7a9bc1175f6fafa8ea2918bc1d62209aaf243 +SHA=9d72fe1a501bc609a875eebf7b6274e18600ed70 VERSION=1.0.0 TAR="$TAR_NAME-$SHA.tar.gz" COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* " -TIS_PATCH_VER=3 +TIS_PATCH_VER=4 diff --git a/openstack/openstack-helm/centos/openstack-helm.spec b/openstack/openstack-helm/centos/openstack-helm.spec index 1294b279..51e9c9a3 100644 --- a/openstack/openstack-helm/centos/openstack-helm.spec +++ b/openstack/openstack-helm/centos/openstack-helm.spec @@ -1,4 +1,4 @@ -%global sha add7a9bc1175f6fafa8ea2918bc1d62209aaf243 +%global sha 9d72fe1a501bc609a875eebf7b6274e18600ed70 %global helm_folder /usr/lib/helm %global toolkit_version 0.1.0 %global helmchart_version 0.1.0 @@ -16,11 +16,9 @@ Source0: %{name}-%{sha}.tar.gz BuildArch: noarch -Patch01: 0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch -Patch02: 0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch -Patch03: 0003-ceilometer-chart-updates.patch -Patch04: 0004-Add-Aodh-Chart.patch -Patch05: 0005-Add-Panko-Chart.patch +Patch01: 0001-ceilometer-chart-updates.patch +Patch02: 0002-Add-Aodh-Chart.patch +Patch03: 0003-Add-Panko-Chart.patch BuildRequires: helm BuildRequires: openstack-helm-infra @@ -34,8 +32,6 @@ Openstack Helm charts %patch01 -p1 %patch02 -p1 %patch03 -p1 -%patch04 -p1 -%patch05 -p1 %build # initialize helm and stage the toolkit diff --git a/openstack/openstack-helm/files/0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch b/openstack/openstack-helm/files/0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch deleted file mode 100644 index 0f390f07..00000000 --- a/openstack/openstack-helm/files/0001-Revert-Neutron-TaaS-support-as-L2-Extension.patch +++ /dev/null @@ -1,334 +0,0 @@ -From c225120329e2d4c69e5ff1b150c88575258de1c8 Mon Sep 17 00:00:00 2001 -From: Gerry Kopec -Date: Tue, 2 Oct 2018 03:03:33 +0000 -Subject: [PATCH 1/3] Revert "Neutron TaaS support as L2 Extension" - -This reverts commit 2f5a1c0c7751ba340d493f3c6f08a23454a7cc38. - -To allow per host overrides to work we need to temporarily revert this -commit. This should be put back once upstream has fixed the issue: -https://storyboard.openstack.org/#!/story/2003873 ---- - neutron/templates/bin/_db-sync.sh.tpl | 5 +--- - .../bin/_neutron-openvswitch-agent.sh.tpl | 5 +--- - neutron/templates/bin/_neutron-server.sh.tpl | 5 +--- - neutron/templates/bin/_neutron-sriov-agent.sh.tpl | 5 +--- - neutron/templates/configmap-etc.yaml | 2 -- - neutron/templates/daemonset-ovs-agent.yaml | 20 ---------------- - neutron/templates/daemonset-sriov-agent.yaml | 20 ---------------- - neutron/templates/deployment-server.yaml | 6 ----- - neutron/values.yaml | 28 ---------------------- - 9 files changed, 4 insertions(+), 92 deletions(-) - -diff --git a/neutron/templates/bin/_db-sync.sh.tpl b/neutron/templates/bin/_db-sync.sh.tpl -index f8704c0..5bd137b 100644 ---- a/neutron/templates/bin/_db-sync.sh.tpl -+++ b/neutron/templates/bin/_db-sync.sh.tpl -@@ -1,7 +1,7 @@ - #!/bin/bash - - {{/* --Copyright 2017 The Openstack-Helm Authors. -+Copyright 2017-2018 OpenStack Foundation. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. -@@ -21,7 +21,4 @@ set -ex - neutron-db-manage \ - --config-file /etc/neutron/neutron.conf \ - --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ --{{- if .Values.conf.plugins.taas.taas.enabled }} -- --subproject tap-as-a-service \ --{{- end }} - upgrade head -diff --git a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl -index a9b90d4..a91c929 100644 ---- a/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl -+++ b/neutron/templates/bin/_neutron-openvswitch-agent.sh.tpl -@@ -1,7 +1,7 @@ - #!/bin/bash - - {{/* --Copyright 2017 The Openstack-Helm Authors. -+Copyright 2017-2018 OpenStack Foundation. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. -@@ -23,6 +23,3 @@ exec neutron-openvswitch-agent \ - --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ - --config-file /tmp/pod-shared/ml2-local-ip.ini \ - --config-file /etc/neutron/plugins/ml2/openvswitch_agent.ini --{{- if .Values.conf.plugins.taas.taas.enabled }} \ -- --config-file /etc/neutron/plugins/ml2/taas.ini --{{- end }} -diff --git a/neutron/templates/bin/_neutron-server.sh.tpl b/neutron/templates/bin/_neutron-server.sh.tpl -index a4de32d..cd24dd3 100644 ---- a/neutron/templates/bin/_neutron-server.sh.tpl -+++ b/neutron/templates/bin/_neutron-server.sh.tpl -@@ -1,7 +1,7 @@ - #!/bin/bash - - {{/* --Copyright 2017 The Openstack-Helm Authors. -+Copyright 2017-2018 OpenStack Foundation. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. -@@ -23,9 +23,6 @@ function start () { - exec neutron-server \ - --config-file /etc/neutron/neutron.conf \ - --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --{{- if .Values.conf.plugins.taas.taas.enabled }} \ -- --config-file /etc/neutron/taas_plugin.ini --{{- end }} - {{- if ( has "sriov" .Values.network.backend ) }} \ - --config-file /etc/neutron/plugins/ml2/sriov_agent.ini - {{- end }} -diff --git a/neutron/templates/bin/_neutron-sriov-agent.sh.tpl b/neutron/templates/bin/_neutron-sriov-agent.sh.tpl -index 98bf5e9..bf158d2 100644 ---- a/neutron/templates/bin/_neutron-sriov-agent.sh.tpl -+++ b/neutron/templates/bin/_neutron-sriov-agent.sh.tpl -@@ -1,7 +1,7 @@ - #!/bin/bash - - {{/* --Copyright 2017 The Openstack-Helm Authors. -+Copyright 2017-2018 OpenStack Foundation. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. -@@ -22,6 +22,3 @@ exec neutron-sriov-nic-agent \ - --config-file /etc/neutron/neutron.conf \ - --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \ - --config-file /etc/neutron/plugins/ml2/sriov_agent.ini --{{- if .Values.conf.plugins.taas.taas.enabled }} \ -- --config-file /etc/neutron/plugins/ml2/taas.ini --{{- end }} -diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml -index 027602b..7293df0 100644 ---- a/neutron/templates/configmap-etc.yaml -+++ b/neutron/templates/configmap-etc.yaml -@@ -185,10 +185,8 @@ data: - l3_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.l3_agent | b64enc }} - metadata_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metadata_agent | b64enc }} - metering_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metering_agent | b64enc }} -- taas_plugin.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.taas_plugin | b64enc }} - ml2_conf.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf | b64enc }} - ml2_conf_sriov.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf_sriov | b64enc }} -- taas.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.taas | b64enc }} - macvtap_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.macvtap_agent | b64enc }} - linuxbridge_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.linuxbridge_agent | b64enc }} - openvswitch_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.openvswitch_agent | b64enc }} -diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml -index 34aba25..3ca1ca3 100644 ---- a/neutron/templates/daemonset-ovs-agent.yaml -+++ b/neutron/templates/daemonset-ovs-agent.yaml -@@ -102,12 +102,6 @@ spec: - mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini - subPath: openvswitch_agent.ini - readOnly: true -- {{- if .Values.conf.plugins.taas.taas.enabled }} -- - name: neutron-etc -- mountPath: /etc/neutron/plugins/ml2/taas.ini -- subPath: taas.ini -- readOnly: true -- {{- end }} - - name: neutron-etc - # NOTE (Portdirect): We mount here to override Kollas - # custom sudoers file when using Kolla images, this -@@ -121,9 +115,6 @@ spec: - readOnly: true - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- if ( has "ovs_agent" $value.pods ) }} -- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }} -- ## if taas is not enabled, do not include taas.filters -- {{- else }} - {{- $filePrefix := replace "_" "-" $key }} - {{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }} - - name: neutron-etc -@@ -132,7 +123,6 @@ spec: - readOnly: true - {{- end }} - {{- end }} -- {{- end }} - - name: run - mountPath: /run - {{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }} -@@ -176,12 +166,6 @@ spec: - mountPath: /etc/neutron/plugins/ml2/openvswitch_agent.ini - subPath: openvswitch_agent.ini - readOnly: true -- {{- if .Values.conf.plugins.taas.taas.enabled }} -- - name: neutron-etc -- mountPath: /etc/neutron/plugins/ml2/taas.ini -- subPath: taas.ini -- readOnly: true -- {{- end }} - - name: neutron-etc - # NOTE (Portdirect): We mount here to override Kollas - # custom sudoers file when using Kolla images, this -@@ -195,9 +179,6 @@ spec: - readOnly: true - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- if ( has "ovs_agent" $value.pods ) }} -- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }} -- ## if taas is not enabled, do not include taas.filters -- {{- else }} - {{- $filePrefix := replace "_" "-" $key }} - {{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }} - - name: neutron-etc -@@ -206,7 +187,6 @@ spec: - readOnly: true - {{- end }} - {{- end }} -- {{- end }} - - name: run - mountPath: /run - {{ if $mounts_neutron_ovs_agent.volumeMounts }}{{ toYaml $mounts_neutron_ovs_agent.volumeMounts | indent 12 }}{{ end }} -diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml -index 4b8b6e1..6130817 100644 ---- a/neutron/templates/daemonset-sriov-agent.yaml -+++ b/neutron/templates/daemonset-sriov-agent.yaml -@@ -85,12 +85,6 @@ spec: - mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini - subPath: sriov_agent.ini - readOnly: true -- {{- if .Values.conf.plugins.taas.taas.enabled }} -- - name: neutron-etc -- mountPath: /etc/neutron/plugins/ml2/taas.ini -- subPath: taas.ini -- readOnly: true -- {{- end }} - - name: neutron-etc - # NOTE (Portdirect): We mount here to override Kollas - # custom sudoers file when using Kolla images, this -@@ -104,9 +98,6 @@ spec: - readOnly: true - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- if ( has "sriov_agent" $value.pods ) }} -- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }} -- ## if taas is not enabled, do not include taas.filters -- {{- else }} - {{- $filePrefix := replace "_" "-" $key }} - {{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }} - - name: neutron-etc -@@ -115,7 +106,6 @@ spec: - readOnly: true - {{- end }} - {{- end }} -- {{- end }} - - name: run - mountPath: /run - {{ if $mounts_neutron_sriov_agent.volumeMounts }}{{ toYaml $mounts_neutron_sriov_agent.volumeMounts | indent 12 }}{{ end }} -@@ -151,12 +141,6 @@ spec: - mountPath: /etc/neutron/plugins/ml2/sriov_agent.ini - subPath: sriov_agent.ini - readOnly: true -- {{- if .Values.conf.plugins.taas.taas.enabled }} -- - name: neutron-etc -- mountPath: /etc/neutron/plugins/ml2/taas.ini -- subPath: taas.ini -- readOnly: true -- {{- end }} - - name: neutron-etc - # NOTE (Portdirect): We mount here to override Kollas - # custom sudoers file when using Kolla images, this -@@ -170,9 +154,6 @@ spec: - readOnly: true - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- if ( has "sriov_agent" $value.pods ) }} -- {{- if and ( eq "taas" $key ) (not $envAll.Values.conf.plugins.taas.taas.enabled) }} -- ## if taas is not enabled, do not include taas.filters -- {{- else }} - {{- $filePrefix := replace "_" "-" $key }} - {{- $rootwrapFile := printf "/etc/neutron/rootwrap.d/%s.filters" $filePrefix }} - - name: neutron-etc -@@ -181,7 +162,6 @@ spec: - readOnly: true - {{- end }} - {{- end }} -- {{- end }} - - name: run - mountPath: /run - {{ if $mounts_neutron_sriov_agent.volumeMounts }}{{ toYaml $mounts_neutron_sriov_agent.volumeMounts | indent 12 }}{{ end }} -diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml -index b66467f..31dec3d 100644 ---- a/neutron/templates/deployment-server.yaml -+++ b/neutron/templates/deployment-server.yaml -@@ -100,12 +100,6 @@ spec: - subPath: sriov_agent.ini - readOnly: true - {{ end }} -- {{- if .Values.conf.plugins.taas.taas.enabled }} -- - name: neutron-etc -- mountPath: /etc/neutron/taas_plugin.ini -- subPath: taas_plugin.ini -- readOnly: true -- {{ end }} - - name: neutron-etc - mountPath: /etc/neutron/api-paste.ini - subPath: api-paste.ini -diff --git a/neutron/values.yaml b/neutron/values.yaml -index 64201be..e5bb6d8 100644 ---- a/neutron/values.yaml -+++ b/neutron/values.yaml -@@ -1433,23 +1433,6 @@ conf: - # NOTE: A second `--config-file` arg can also be added above. Since - # many neutron components are installed like that (eg: by devstack). - # Adjust to suit local requirements. -- taas: -- pods: -- - ovs_agent -- - sriov_agent -- content: | -- # neutron-rootwrap command filters for nodes on which neutron -- # tap-as-a-service(taas) is eanbled. Taas uses this command -- # as part of its flow control. -- -- # format seems to be -- # cmd-name: filter-name, raw-command, user, args -- -- [Filters] -- -- # This is needed to allow taas to insert/remove vlan id to the -- # target vf under /sys/class/net/[device-name]/device/sriov/[vf-index]/[mirror] -- i40e_sysfs_command: RegExpFilter, /opt/i40e_sysfs_command, root, /opt/i40e_sysfs_command, \w+, .+, .+ - neutron: - DEFAULT: - log_config_append: /etc/neutron/logging.conf -@@ -1495,7 +1478,6 @@ conf: - keys: - - root - - neutron -- - neutron_taas - handlers: - keys: - - stdout -@@ -1513,11 +1495,6 @@ conf: - handlers: - - stdout - qualname: neutron -- logger_neutron_taas: -- level: INFO -- handlers: -- - stdout -- qualname: neutron_taas - logger_amqp: - level: WARNING - handlers: stderr -@@ -1573,12 +1550,7 @@ conf: - # using ml2_type_vlan.network_vlan_ranges: - # ml2_type_vlan: - # network_vlan_ranges: "external:1100:1110" -- agent: -- extensions: "" - ml2_conf_sriov: null -- taas: -- taas: -- enabled: False - openvswitch_agent: - agent: - tunnel_types: vxlan --- -1.8.3.1 - diff --git a/openstack/openstack-helm/files/0003-ceilometer-chart-updates.patch b/openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch similarity index 98% rename from openstack/openstack-helm/files/0003-ceilometer-chart-updates.patch rename to openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch index e9cac139..960b250f 100644 --- a/openstack/openstack-helm/files/0003-ceilometer-chart-updates.patch +++ b/openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch @@ -1,7 +1,7 @@ -From f45bfe9ea150965c011560b500ed6e01886bada3 Mon Sep 17 00:00:00 2001 +From 194d712bafb63186850fb451185bdaaaa8054c23 Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Fri, 19 Oct 2018 14:46:27 -0400 -Subject: [PATCH 3/3] ceilometer chart updates +Subject: [PATCH 1/3] ceilometer chart updates This commit includes the following changes: - add polling process with ipmi function @@ -19,19 +19,19 @@ We need to rework a bit once the commit "Openstack: Use k8s secret to store conf ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl | 13 + ceilometer/templates/bin/_db-sync.sh.tpl | 2 +- ceilometer/templates/configmap-bin.yaml | 2 + - ceilometer/templates/configmap-etc.yaml | 8 + + ceilometer/templates/configmap-etc.yaml | 6 + ceilometer/templates/daemonset-compute.yaml | 4 + ceilometer/templates/daemonset-ipmi.yaml | 105 ++ ceilometer/templates/deployment-central.yaml | 4 + ceilometer/templates/deployment-notification.yaml | 20 + - ceilometer/values.yaml | 1530 ++++++++++----------- - 9 files changed, 902 insertions(+), 786 deletions(-) + ceilometer/values.yaml | 1532 ++++++++++----------- + 9 files changed, 901 insertions(+), 787 deletions(-) create mode 100644 ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl create mode 100644 ceilometer/templates/daemonset-ipmi.yaml diff --git a/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl b/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl new file mode 100644 -index 0000000..ad280c3 +index 00000000..ad280c30 --- /dev/null +++ b/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl @@ -0,0 +1,13 @@ @@ -49,7 +49,7 @@ index 0000000..ad280c3 + --polling-namespaces ipmi \ + --config-file /etc/ceilometer/ceilometer.conf diff --git a/ceilometer/templates/bin/_db-sync.sh.tpl b/ceilometer/templates/bin/_db-sync.sh.tpl -index 02f6f5d..ba7c1d8 100644 +index 02f6f5d4..ba7c1d84 100644 --- a/ceilometer/templates/bin/_db-sync.sh.tpl +++ b/ceilometer/templates/bin/_db-sync.sh.tpl @@ -18,4 +18,4 @@ limitations under the License. @@ -59,7 +59,7 @@ index 02f6f5d..ba7c1d8 100644 -exec ceilometer-dbsync +exec ceilometer-upgrade --skip-metering-database diff --git a/ceilometer/templates/configmap-bin.yaml b/ceilometer/templates/configmap-bin.yaml -index 6c7d59a..558f24e 100644 +index 6c7d59a9..558f24e7 100644 --- a/ceilometer/templates/configmap-bin.yaml +++ b/ceilometer/templates/configmap-bin.yaml @@ -53,6 +53,8 @@ data: @@ -72,7 +72,7 @@ index 6c7d59a..558f24e 100644 {{ tuple "bin/_ceilometer-notification.sh.tpl" . | include "helm-toolkit.utils.template" | indent 4 }} rabbit-init.sh: | diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml -index d7d9653..14105f5 100644 +index 17ddb1b0..c48a3b8b 100644 --- a/ceilometer/templates/configmap-etc.yaml +++ b/ceilometer/templates/configmap-etc.yaml @@ -32,6 +32,10 @@ limitations under the License. @@ -86,18 +86,16 @@ index d7d9653..14105f5 100644 {{- if empty .Values.conf.ceilometer.database.connection -}} {{- $_ := tuple "oslo_db" "internal" "ceilometer" "mysql" . | include "helm-toolkit.endpoints.authenticated_endpoint_uri_lookup"| set .Values.conf.ceilometer.database "connection" -}} {{- end -}} -@@ -127,5 +131,9 @@ data: - {{ toYaml .Values.conf.event_definitions | indent 4 }} - gnocchi_resources.yaml: | - {{ toYaml .Values.conf.gnocchi_resources | indent 4 }} -+ meters.yaml: | -+{{ toYaml .Values.conf.meters | indent 4 }} -+ polling.yaml: | -+{{ toYaml .Values.conf.polling | indent 4 }} - {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" ) | indent 2 }} +@@ -120,5 +124,7 @@ data: + pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }} + event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }} + gnocchi_resources.yaml: {{ toYaml .Values.conf.gnocchi_resources | b64enc }} ++ meters.yaml: {{ toYaml .Values.conf.meters | b64enc }} ++ polling.yaml: {{ toYaml .Values.conf.polling | b64enc }} + {{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" "format" "Secret" ) | indent 2 }} {{- end }} diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml -index cf31840..d2fd9ea 100644 +index 686572af..bff2e15a 100644 --- a/ceilometer/templates/daemonset-compute.yaml +++ b/ceilometer/templates/daemonset-compute.yaml @@ -91,6 +91,10 @@ spec: @@ -113,7 +111,7 @@ index cf31840..d2fd9ea 100644 subPath: ceilometer-compute.sh diff --git a/ceilometer/templates/daemonset-ipmi.yaml b/ceilometer/templates/daemonset-ipmi.yaml new file mode 100644 -index 0000000..9a7d72b +index 00000000..9a7d72bf --- /dev/null +++ b/ceilometer/templates/daemonset-ipmi.yaml @@ -0,0 +1,105 @@ @@ -223,7 +221,7 @@ index 0000000..9a7d72b +{{ if $mounts_ceilometer_ipmi.volumes }}{{ toYaml $mounts_ceilometer_ipmi.volumes | indent 8 }}{{ end }} +{{- end }} diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml -index 2fe7ed3..06121f2 100644 +index b7a597bf..7a6cd2b6 100644 --- a/ceilometer/templates/deployment-central.yaml +++ b/ceilometer/templates/deployment-central.yaml @@ -89,6 +89,10 @@ spec: @@ -238,7 +236,7 @@ index 2fe7ed3..06121f2 100644 mountPath: /tmp/ceilometer-central.sh subPath: ceilometer-central.sh diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml -index 2eeb571..f61c5e8 100644 +index 06fda3df..cb528ca9 100644 --- a/ceilometer/templates/deployment-notification.yaml +++ b/ceilometer/templates/deployment-notification.yaml @@ -89,14 +89,30 @@ spec: @@ -270,8 +268,8 @@ index 2eeb571..f61c5e8 100644 + - name: etcpanko + emptyDir: {} - name: ceilometer-etc - configMap: - name: ceilometer-etc + secret: + secretName: ceilometer-etc @@ -105,5 +121,9 @@ spec: configMap: name: ceilometer-bin @@ -283,7 +281,7 @@ index 2eeb571..f61c5e8 100644 {{ if $mounts_ceilometer_notification.volumes }}{{ toYaml $mounts_ceilometer_notification.volumes | indent 8 }}{{ end }} {{- end }} diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml -index 4e7f104..54d1e5a 100644 +index 50219679..5908a4ec 100644 --- a/ceilometer/values.yaml +++ b/ceilometer/values.yaml @@ -29,6 +29,9 @@ labels: @@ -1284,9 +1282,7 @@ index 4e7f104..54d1e5a 100644 - fields: payload.serial - status: - fields: payload.status -+ email: -+ fields: payload.email - ttl: +- ttl: - fields: payload.ttl - updated_at: - fields: payload.updated_at @@ -1422,6 +1418,9 @@ index 4e7f104..54d1e5a 100644 - traits: - availability_zone: - fields: payload.availability_zone ++ email: ++ fields: payload.email ++ ttl: + fields: payload.ttl + action: + fields: payload.action @@ -2100,7 +2099,7 @@ index 4e7f104..54d1e5a 100644 jobs: db_init: requests: -@@ -2068,6 +2027,7 @@ manifests: +@@ -2073,6 +2032,7 @@ manifests: deployment_central: true deployment_collector: true daemonset_compute: true @@ -2109,5 +2108,5 @@ index 4e7f104..54d1e5a 100644 ingress_api: true job_bootstrap: true -- -1.8.3.1 +2.16.5 diff --git a/openstack/openstack-helm/files/0004-Add-Aodh-Chart.patch b/openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch similarity index 98% rename from openstack/openstack-helm/files/0004-Add-Aodh-Chart.patch rename to openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch index 68ade97e..7db68f07 100644 --- a/openstack/openstack-helm/files/0004-Add-Aodh-Chart.patch +++ b/openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch @@ -1,7 +1,7 @@ -From aeed59c1ca49950c7ba667a5f9b44ec552b63f5f Mon Sep 17 00:00:00 2001 +From 8615d16af10e1d14dedeb9a026e59491142c0dbf Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Wed, 14 Nov 2018 11:39:55 -0500 -Subject: [PATCH 1/1] Add Aodh Chart +Subject: [PATCH 2/3] Add Aodh Chart This commit adds a helm chart to deloy Aodh. @@ -82,7 +82,7 @@ https://review.openstack.org/#/c/468530/ diff --git a/aodh/Chart.yaml b/aodh/Chart.yaml new file mode 100644 -index 0000000..6f666f0 +index 00000000..6f666f0e --- /dev/null +++ b/aodh/Chart.yaml @@ -0,0 +1,24 @@ @@ -112,7 +112,7 @@ index 0000000..6f666f0 + - name: OpenStack-Helm Authors diff --git a/aodh/requirements.yaml b/aodh/requirements.yaml new file mode 100644 -index 0000000..53782e6 +index 00000000..53782e69 --- /dev/null +++ b/aodh/requirements.yaml @@ -0,0 +1,18 @@ @@ -136,7 +136,7 @@ index 0000000..53782e6 + version: 0.1.0 diff --git a/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl b/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl new file mode 100644 -index 0000000..8ca0e7c +index 00000000..8ca0e7c5 --- /dev/null +++ b/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl @@ -0,0 +1,21 @@ @@ -163,7 +163,7 @@ index 0000000..8ca0e7c +aodh-expirer diff --git a/aodh/templates/bin/_aodh-api.sh.tpl b/aodh/templates/bin/_aodh-api.sh.tpl new file mode 100644 -index 0000000..708b327 +index 00000000..708b3272 --- /dev/null +++ b/aodh/templates/bin/_aodh-api.sh.tpl @@ -0,0 +1,39 @@ @@ -208,7 +208,7 @@ index 0000000..708b327 +$COMMAND diff --git a/aodh/templates/bin/_aodh-evaluator.sh.tpl b/aodh/templates/bin/_aodh-evaluator.sh.tpl new file mode 100644 -index 0000000..7c7b07b +index 00000000..7c7b07b0 --- /dev/null +++ b/aodh/templates/bin/_aodh-evaluator.sh.tpl @@ -0,0 +1,21 @@ @@ -235,7 +235,7 @@ index 0000000..7c7b07b +exec aodh-evaluator --config-file=/etc/aodh/aodh.conf diff --git a/aodh/templates/bin/_aodh-listener.sh.tpl b/aodh/templates/bin/_aodh-listener.sh.tpl new file mode 100644 -index 0000000..0abeba4 +index 00000000..0abeba43 --- /dev/null +++ b/aodh/templates/bin/_aodh-listener.sh.tpl @@ -0,0 +1,21 @@ @@ -262,7 +262,7 @@ index 0000000..0abeba4 +exec aodh-listener --config-file=/etc/aodh/aodh.conf diff --git a/aodh/templates/bin/_aodh-notifier.sh.tpl b/aodh/templates/bin/_aodh-notifier.sh.tpl new file mode 100644 -index 0000000..b1b4f94 +index 00000000..b1b4f947 --- /dev/null +++ b/aodh/templates/bin/_aodh-notifier.sh.tpl @@ -0,0 +1,21 @@ @@ -289,7 +289,7 @@ index 0000000..b1b4f94 +exec aodh-notifier --config-file=/etc/aodh/aodh.conf diff --git a/aodh/templates/bin/_aodh-test.sh.tpl b/aodh/templates/bin/_aodh-test.sh.tpl new file mode 100644 -index 0000000..fc95b06 +index 00000000..fc95b06c --- /dev/null +++ b/aodh/templates/bin/_aodh-test.sh.tpl @@ -0,0 +1,54 @@ @@ -349,7 +349,7 @@ index 0000000..fc95b06 + diff --git a/aodh/templates/bin/_bootstrap.sh.tpl b/aodh/templates/bin/_bootstrap.sh.tpl new file mode 100644 -index 0000000..533c0a5 +index 00000000..533c0a5a --- /dev/null +++ b/aodh/templates/bin/_bootstrap.sh.tpl @@ -0,0 +1,20 @@ @@ -375,7 +375,7 @@ index 0000000..533c0a5 +{{ .Values.bootstrap.script | default "echo 'Not Enabled'" }} diff --git a/aodh/templates/bin/_db-sync.sh.tpl b/aodh/templates/bin/_db-sync.sh.tpl new file mode 100644 -index 0000000..7eb7bd3 +index 00000000..7eb7bd3f --- /dev/null +++ b/aodh/templates/bin/_db-sync.sh.tpl @@ -0,0 +1,21 @@ @@ -402,7 +402,7 @@ index 0000000..7eb7bd3 +aodh-dbsync diff --git a/aodh/templates/configmap-bin.yaml b/aodh/templates/configmap-bin.yaml new file mode 100644 -index 0000000..3ee32e7 +index 00000000..3ee32e79 --- /dev/null +++ b/aodh/templates/configmap-bin.yaml @@ -0,0 +1,60 @@ @@ -468,7 +468,7 @@ index 0000000..3ee32e7 +{{- end }} diff --git a/aodh/templates/configmap-etc.yaml b/aodh/templates/configmap-etc.yaml new file mode 100644 -index 0000000..81f4e1f +index 00000000..81f4e1fb --- /dev/null +++ b/aodh/templates/configmap-etc.yaml @@ -0,0 +1,123 @@ @@ -598,7 +598,7 @@ index 0000000..81f4e1f \ No newline at end of file diff --git a/aodh/templates/cron-job-alarms-cleaner.yaml b/aodh/templates/cron-job-alarms-cleaner.yaml new file mode 100644 -index 0000000..6862c5f +index 00000000..6862c5f3 --- /dev/null +++ b/aodh/templates/cron-job-alarms-cleaner.yaml @@ -0,0 +1,84 @@ @@ -688,7 +688,7 @@ index 0000000..6862c5f +{{- end }} diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml new file mode 100644 -index 0000000..6190261 +index 00000000..61902610 --- /dev/null +++ b/aodh/templates/deployment-api.yaml @@ -0,0 +1,121 @@ @@ -816,7 +816,7 @@ index 0000000..6190261 \ No newline at end of file diff --git a/aodh/templates/deployment-evaluator.yaml b/aodh/templates/deployment-evaluator.yaml new file mode 100644 -index 0000000..175f142 +index 00000000..175f1421 --- /dev/null +++ b/aodh/templates/deployment-evaluator.yaml @@ -0,0 +1,101 @@ @@ -923,7 +923,7 @@ index 0000000..175f142 +{{- end }} diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml new file mode 100644 -index 0000000..ca1dc19 +index 00000000..ca1dc191 --- /dev/null +++ b/aodh/templates/deployment-listener.yaml @@ -0,0 +1,102 @@ @@ -1031,7 +1031,7 @@ index 0000000..ca1dc19 + diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml new file mode 100644 -index 0000000..068d83a +index 00000000..068d83a9 --- /dev/null +++ b/aodh/templates/deployment-notifier.yaml @@ -0,0 +1,103 @@ @@ -1140,7 +1140,7 @@ index 0000000..068d83a + diff --git a/aodh/templates/ingress-api.yaml b/aodh/templates/ingress-api.yaml new file mode 100644 -index 0000000..fe3f31c +index 00000000..fe3f31c4 --- /dev/null +++ b/aodh/templates/ingress-api.yaml @@ -0,0 +1,20 @@ @@ -1166,7 +1166,7 @@ index 0000000..fe3f31c +{{- end }} diff --git a/aodh/templates/job-bootstrap.yaml b/aodh/templates/job-bootstrap.yaml new file mode 100644 -index 0000000..17cea12 +index 00000000..17cea12b --- /dev/null +++ b/aodh/templates/job-bootstrap.yaml @@ -0,0 +1,20 @@ @@ -1192,7 +1192,7 @@ index 0000000..17cea12 +{{- end }} diff --git a/aodh/templates/job-db-drop.yaml b/aodh/templates/job-db-drop.yaml new file mode 100644 -index 0000000..8c2d80c +index 00000000..8c2d80c3 --- /dev/null +++ b/aodh/templates/job-db-drop.yaml @@ -0,0 +1,20 @@ @@ -1219,7 +1219,7 @@ index 0000000..8c2d80c \ No newline at end of file diff --git a/aodh/templates/job-db-init.yaml b/aodh/templates/job-db-init.yaml new file mode 100644 -index 0000000..5d14fb7 +index 00000000..5d14fb75 --- /dev/null +++ b/aodh/templates/job-db-init.yaml @@ -0,0 +1,20 @@ @@ -1245,7 +1245,7 @@ index 0000000..5d14fb7 +{{- end }} diff --git a/aodh/templates/job-db-sync.yaml b/aodh/templates/job-db-sync.yaml new file mode 100644 -index 0000000..2428c7f +index 00000000..2428c7f2 --- /dev/null +++ b/aodh/templates/job-db-sync.yaml @@ -0,0 +1,20 @@ @@ -1271,7 +1271,7 @@ index 0000000..2428c7f +{{- end }} diff --git a/aodh/templates/job-image-repo-sync.yaml b/aodh/templates/job-image-repo-sync.yaml new file mode 100644 -index 0000000..0eeef1e +index 00000000..0eeef1ed --- /dev/null +++ b/aodh/templates/job-image-repo-sync.yaml @@ -0,0 +1,20 @@ @@ -1297,7 +1297,7 @@ index 0000000..0eeef1e +{{- end }} diff --git a/aodh/templates/job-ks-endpoints.yaml b/aodh/templates/job-ks-endpoints.yaml new file mode 100644 -index 0000000..7fc30c2 +index 00000000..7fc30c2b --- /dev/null +++ b/aodh/templates/job-ks-endpoints.yaml @@ -0,0 +1,20 @@ @@ -1323,7 +1323,7 @@ index 0000000..7fc30c2 +{{- end }} diff --git a/aodh/templates/job-ks-service.yaml b/aodh/templates/job-ks-service.yaml new file mode 100644 -index 0000000..b4120b3 +index 00000000..b4120b3c --- /dev/null +++ b/aodh/templates/job-ks-service.yaml @@ -0,0 +1,20 @@ @@ -1349,7 +1349,7 @@ index 0000000..b4120b3 +{{- end }} diff --git a/aodh/templates/job-ks-user.yaml b/aodh/templates/job-ks-user.yaml new file mode 100644 -index 0000000..9618931 +index 00000000..96189310 --- /dev/null +++ b/aodh/templates/job-ks-user.yaml @@ -0,0 +1,20 @@ @@ -1375,7 +1375,7 @@ index 0000000..9618931 +{{- end }} diff --git a/aodh/templates/job-rabbit-init.yaml b/aodh/templates/job-rabbit-init.yaml new file mode 100644 -index 0000000..06cc5a7 +index 00000000..06cc5a71 --- /dev/null +++ b/aodh/templates/job-rabbit-init.yaml @@ -0,0 +1,20 @@ @@ -1401,7 +1401,7 @@ index 0000000..06cc5a7 +{{- end }} diff --git a/aodh/templates/pdb-api.yaml b/aodh/templates/pdb-api.yaml new file mode 100644 -index 0000000..1892708 +index 00000000..1892708e --- /dev/null +++ b/aodh/templates/pdb-api.yaml @@ -0,0 +1,29 @@ @@ -1436,7 +1436,7 @@ index 0000000..1892708 +{{- end }} diff --git a/aodh/templates/pod-aodh-test.yaml b/aodh/templates/pod-aodh-test.yaml new file mode 100644 -index 0000000..9254c92 +index 00000000..9254c922 --- /dev/null +++ b/aodh/templates/pod-aodh-test.yaml @@ -0,0 +1,72 @@ @@ -1514,7 +1514,7 @@ index 0000000..9254c92 +{{- end }} diff --git a/aodh/templates/secret-db.yaml b/aodh/templates/secret-db.yaml new file mode 100644 -index 0000000..85568c1 +index 00000000..85568c1a --- /dev/null +++ b/aodh/templates/secret-db.yaml @@ -0,0 +1,30 @@ @@ -1551,7 +1551,7 @@ index 0000000..85568c1 \ No newline at end of file diff --git a/aodh/templates/secret-keystone.yaml b/aodh/templates/secret-keystone.yaml new file mode 100644 -index 0000000..aef25b2 +index 00000000..aef25b2e --- /dev/null +++ b/aodh/templates/secret-keystone.yaml @@ -0,0 +1,30 @@ @@ -1587,7 +1587,7 @@ index 0000000..aef25b2 +{{- end }} diff --git a/aodh/templates/secret-rabbitmq.yaml b/aodh/templates/secret-rabbitmq.yaml new file mode 100644 -index 0000000..ad65ae3 +index 00000000..ad65ae34 --- /dev/null +++ b/aodh/templates/secret-rabbitmq.yaml @@ -0,0 +1,30 @@ @@ -1623,7 +1623,7 @@ index 0000000..ad65ae3 +{{- end }} diff --git a/aodh/templates/service-api.yaml b/aodh/templates/service-api.yaml new file mode 100644 -index 0000000..bb9083e +index 00000000..bb9083ef --- /dev/null +++ b/aodh/templates/service-api.yaml @@ -0,0 +1,39 @@ @@ -1668,7 +1668,7 @@ index 0000000..bb9083e +{{- end }} diff --git a/aodh/templates/service-ingress-api.yaml b/aodh/templates/service-ingress-api.yaml new file mode 100644 -index 0000000..c1b9658 +index 00000000..c1b96584 --- /dev/null +++ b/aodh/templates/service-ingress-api.yaml @@ -0,0 +1,20 @@ @@ -1694,7 +1694,7 @@ index 0000000..c1b9658 +{{- end }} diff --git a/aodh/values.yaml b/aodh/values.yaml new file mode 100644 -index 0000000..bd7a736 +index 00000000..bd7a736f --- /dev/null +++ b/aodh/values.yaml @@ -0,0 +1,671 @@ @@ -2370,5 +2370,5 @@ index 0000000..bd7a736 + service_ingress_api: true + -- -1.8.3.1 +2.16.5 diff --git a/openstack/openstack-helm/files/0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch b/openstack/openstack-helm/files/0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch deleted file mode 100644 index a84386f2..00000000 --- a/openstack/openstack-helm/files/0002-Revert-Openstack-Use-k8s-secret-to-store-config.patch +++ /dev/null @@ -1,1811 +0,0 @@ -From e9053d311e689e937bfdb451f872627073af4ac6 Mon Sep 17 00:00:00 2001 -From: Gerry Kopec -Date: Tue, 2 Oct 2018 03:04:26 +0000 -Subject: [PATCH 2/3] Revert "Openstack: Use k8s secret to store config" - -This reverts commit 83b91e6e1be4bcab83c333f993fdc9e6fa8fa4bc. - -Conflicts: - gnocchi/templates/configmap-etc.yaml - gnocchi/templates/daemonset-metricd.yaml - gnocchi/templates/daemonset-statsd.yaml - gnocchi/templates/deployment-api.yaml - gnocchi/templates/job-db-init-indexer.yaml - gnocchi/templates/job-db-sync.yaml - gnocchi/templates/pod-gnocchi-test.yaml - -To allow per host overrides to work we need to temporarily revert this -commit. This should be put back once upstream has fixed the issue: -https://storyboard.openstack.org/#!/story/2003873 ---- - barbican/templates/configmap-etc.yaml | 21 +++++--- - barbican/templates/deployment-api.yaml | 4 +- - ceilometer/templates/configmap-etc.yaml | 29 ++++++----- - ceilometer/templates/daemonset-compute.yaml | 4 +- - ceilometer/templates/deployment-api.yaml | 4 +- - ceilometer/templates/deployment-central.yaml | 4 +- - ceilometer/templates/deployment-collector.yaml | 4 +- - ceilometer/templates/deployment-notification.yaml | 4 +- - ceilometer/templates/pod-rally-test.yaml | 4 +- - cinder/templates/configmap-etc.yaml | 33 ++++++++----- - .../cron-job-cinder-volume-usage-audit.yaml | 4 +- - cinder/templates/deployment-api.yaml | 4 +- - cinder/templates/deployment-backup.yaml | 4 +- - cinder/templates/deployment-scheduler.yaml | 4 +- - cinder/templates/deployment-volume.yaml | 5 +- - cinder/templates/job-backup-storage-init.yaml | 4 +- - cinder/templates/pod-rally-test.yaml | 4 +- - congress/templates/configmap-etc.yaml | 15 +++--- - congress/templates/deployment-api.yaml | 4 +- - congress/templates/deployment-datasource.yaml | 4 +- - congress/templates/deployment-policy-engine.yaml | 4 +- - glance/templates/configmap-etc.yaml | 26 ++++++---- - glance/templates/deployment-api.yaml | 4 +- - glance/templates/deployment-registry.yaml | 4 +- - glance/templates/pod-rally-test.yaml | 4 +- - heat/templates/configmap-etc.yaml | 21 +++++--- - heat/templates/cron-job-engine-cleaner.yaml | 4 +- - heat/templates/deployment-api.yaml | 4 +- - heat/templates/deployment-cfn.yaml | 4 +- - heat/templates/deployment-cloudwatch.yaml | 4 +- - heat/templates/deployment-engine.yaml | 4 +- - heat/templates/pod-rally-test.yaml | 4 +- - horizon/templates/configmap-etc.yaml | 10 ++-- - horizon/templates/deployment.yaml | 4 +- - horizon/templates/job-db-sync.yaml | 4 +- - ironic/templates/configmap-etc.yaml | 16 +++--- - ironic/templates/deployment-api.yaml | 4 +- - ironic/templates/statefulset-conductor.yaml | 4 +- - keystone/templates/configmap-etc.yaml | 29 ++++++----- - keystone/templates/cron-job-credential-rotate.yaml | 4 +- - keystone/templates/cron-job-fernet-rotate.yaml | 4 +- - keystone/templates/deployment-api.yaml | 4 +- - keystone/templates/job-credential-setup.yaml | 8 +-- - keystone/templates/job-domain-manage.yaml | 4 +- - keystone/templates/job-fernet-setup.yaml | 8 +-- - keystone/templates/pod-rally-test.yaml | 4 +- - magnum/templates/configmap-etc.yaml | 15 +++--- - magnum/templates/deployment-api.yaml | 4 +- - magnum/templates/statefulset-conductor.yaml | 4 +- - mistral/templates/configmap-etc.yaml | 18 ++++--- - mistral/templates/deployment-api.yaml | 4 +- - mistral/templates/deployment-executor.yaml | 4 +- - mistral/templates/pod-rally-test.yaml | 4 +- - mistral/templates/statefulset-engine.yaml | 4 +- - mistral/templates/statefulset-event-engine.yaml | 4 +- - mistral/values.yaml | 2 +- - neutron/templates/configmap-etc.yaml | 57 ++++++++++++++-------- - neutron/templates/daemonset-dhcp-agent.yaml | 4 +- - neutron/templates/daemonset-l3-agent.yaml | 4 +- - neutron/templates/daemonset-lb-agent.yaml | 4 +- - neutron/templates/daemonset-metadata-agent.yaml | 4 +- - neutron/templates/daemonset-ovs-agent.yaml | 4 +- - neutron/templates/daemonset-sriov-agent.yaml | 4 +- - neutron/templates/deployment-server.yaml | 4 +- - neutron/templates/pod-rally-test.yaml | 4 +- - nova/templates/configmap-etc.yaml | 34 ++++++++----- - nova/templates/cron-job-cell-setup.yaml | 4 +- - nova/templates/cron-job-service-cleaner.yaml | 4 +- - nova/templates/daemonset-compute.yaml | 4 +- - nova/templates/deployment-api-metadata.yaml | 4 +- - nova/templates/deployment-api-osapi.yaml | 4 +- - nova/templates/deployment-conductor.yaml | 4 +- - nova/templates/deployment-consoleauth.yaml | 4 +- - nova/templates/deployment-novncproxy.yaml | 4 +- - nova/templates/deployment-placement.yaml | 4 +- - nova/templates/deployment-scheduler.yaml | 4 +- - nova/templates/deployment-spiceproxy.yaml | 4 +- - nova/templates/job-cell-setup.yaml | 4 +- - nova/templates/pod-rally-test.yaml | 4 +- - nova/templates/statefulset-compute-ironic.yaml | 4 +- - rally/templates/configmap-etc.yaml | 6 +-- - rally/templates/job-manage-db.yaml | 4 +- - rally/templates/job-run-task.yaml | 4 +- - senlin/templates/configmap-etc.yaml | 18 ++++--- - senlin/templates/cron-job-engine-cleaner.yaml | 4 +- - senlin/templates/deployment-api.yaml | 4 +- - senlin/templates/deployment-engine.yaml | 4 +- - tempest/templates/configmap-etc.yaml | 12 +++-- - tempest/templates/job-run-tests.yaml | 4 +- - 89 files changed, 365 insertions(+), 294 deletions(-) - -diff --git a/barbican/templates/configmap-etc.yaml b/barbican/templates/configmap-etc.yaml -index 18d5d37..b0bc113 100644 ---- a/barbican/templates/configmap-etc.yaml -+++ b/barbican/templates/configmap-etc.yaml -@@ -86,15 +86,20 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: barbican-etc --type: Opaque - data: -- barbican.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.barbican | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- barbican-api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- api_audit_map.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.audit_map | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -- barbican-api.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.barbican_api | b64enc }} -+ barbican.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.barbican | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ barbican-api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ api_audit_map.conf: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.audit_map | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+ barbican-api.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.barbican_api | indent 4 }} - {{- end }} -diff --git a/barbican/templates/deployment-api.yaml b/barbican/templates/deployment-api.yaml -index 3187182..8270d36 100644 ---- a/barbican/templates/deployment-api.yaml -+++ b/barbican/templates/deployment-api.yaml -@@ -109,8 +109,8 @@ spec: - - name: etcbarbican - emptyDir: {} - - name: barbican-etc -- secret: -- secretName: barbican-etc -+ configMap: -+ name: barbican-etc - defaultMode: 0444 - - name: barbican-bin - configMap: -diff --git a/ceilometer/templates/configmap-etc.yaml b/ceilometer/templates/configmap-etc.yaml -index 17ddb1b..d7d9653 100644 ---- a/ceilometer/templates/configmap-etc.yaml -+++ b/ceilometer/templates/configmap-etc.yaml -@@ -107,18 +107,25 @@ limitations under the License. - - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: ceilometer-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests | b64enc }} -- ceilometer.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | b64enc }} -- api_paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -- event_pipeline.yaml: {{ toYaml .Values.conf.event_pipeline | b64enc }} -- pipeline.yaml: {{ toYaml .Values.conf.pipeline | b64enc }} -- event_definitions.yaml: {{ toYaml .Values.conf.event_definitions | b64enc }} -- gnocchi_resources.yaml: {{ toYaml .Values.conf.gnocchi_resources | b64enc }} --{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" "format" "Secret" ) | indent 2 }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests | indent 4 }} -+ ceilometer.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ceilometer | indent 4 }} -+ api_paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+ event_pipeline.yaml: | -+{{ toYaml .Values.conf.event_pipeline | indent 4 }} -+ pipeline.yaml: | -+{{ toYaml .Values.conf.pipeline | indent 4 }} -+ event_definitions.yaml: | -+{{ toYaml .Values.conf.event_definitions | indent 4 }} -+ gnocchi_resources.yaml: | -+{{ toYaml .Values.conf.gnocchi_resources | indent 4 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_ceilometer "key" "wsgi-ceilometer.conf" ) | indent 2 }} - {{- end }} -diff --git a/ceilometer/templates/daemonset-compute.yaml b/ceilometer/templates/daemonset-compute.yaml -index 686572a..cf31840 100644 ---- a/ceilometer/templates/daemonset-compute.yaml -+++ b/ceilometer/templates/daemonset-compute.yaml -@@ -111,8 +111,8 @@ spec: - - name: pod-etc-ceilometer - emptyDir: {} - - name: ceilometer-etc -- secret: -- secretName: ceilometer-etc -+ configMap: -+ name: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: -diff --git a/ceilometer/templates/deployment-api.yaml b/ceilometer/templates/deployment-api.yaml -index 2a4c879..7ebc230 100644 ---- a/ceilometer/templates/deployment-api.yaml -+++ b/ceilometer/templates/deployment-api.yaml -@@ -116,8 +116,8 @@ spec: - - name: pod-etc-ceilometer - emptyDir: {} - - name: ceilometer-etc -- secret: -- secretName: ceilometer-etc -+ configMap: -+ name: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: -diff --git a/ceilometer/templates/deployment-central.yaml b/ceilometer/templates/deployment-central.yaml -index b7a597b..2fe7ed3 100644 ---- a/ceilometer/templates/deployment-central.yaml -+++ b/ceilometer/templates/deployment-central.yaml -@@ -98,8 +98,8 @@ spec: - - name: pod-etc-ceilometer - emptyDir: {} - - name: ceilometer-etc -- secret: -- secretName: ceilometer-etc -+ configMap: -+ name: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: -diff --git a/ceilometer/templates/deployment-collector.yaml b/ceilometer/templates/deployment-collector.yaml -index 07c761e..0fed543 100644 ---- a/ceilometer/templates/deployment-collector.yaml -+++ b/ceilometer/templates/deployment-collector.yaml -@@ -98,8 +98,8 @@ spec: - - name: pod-etc-ceilometer - emptyDir: {} - - name: ceilometer-etc -- secret: -- secretName: ceilometer-etc -+ configMap: -+ name: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: -diff --git a/ceilometer/templates/deployment-notification.yaml b/ceilometer/templates/deployment-notification.yaml -index 06fda3d..2eeb571 100644 ---- a/ceilometer/templates/deployment-notification.yaml -+++ b/ceilometer/templates/deployment-notification.yaml -@@ -98,8 +98,8 @@ spec: - - name: pod-etc-ceilometer - emptyDir: {} - - name: ceilometer-etc -- secret: -- secretName: ceilometer-etc -+ configMap: -+ name: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: -diff --git a/ceilometer/templates/pod-rally-test.yaml b/ceilometer/templates/pod-rally-test.yaml -index 9cbf2fd..f2dc212 100644 ---- a/ceilometer/templates/pod-rally-test.yaml -+++ b/ceilometer/templates/pod-rally-test.yaml -@@ -87,8 +87,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: ceilometer-etc -- secret: -- secretName: ceilometer-etc -+ configMap: -+ name: ceilometer-etc - defaultMode: 0444 - - name: ceilometer-bin - configMap: -diff --git a/cinder/templates/configmap-etc.yaml b/cinder/templates/configmap-etc.yaml -index 88d9fa0..e116bde 100644 ---- a/cinder/templates/configmap-etc.yaml -+++ b/cinder/templates/configmap-etc.yaml -@@ -108,24 +108,33 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: cinder-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- cinder.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- backends.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -- cinder_sudoers: {{ $envAll.Values.conf.cinder_sudoers | b64enc }} -- rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ cinder.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.cinder | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ backends.conf: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.backends | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+ cinder_sudoers: | -+{{ $envAll.Values.conf.cinder_sudoers | indent 4 }} -+ rootwrap.conf: | -+{{ $envAll.Values.conf.rootwrap | indent 4 }} - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- $filePrefix := replace "_" "-" $key }} -- {{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }} -+ {{ printf "%s.filters" $filePrefix }}: | -+{{ $value.content | indent 4 }} - {{- end }} - {{- if .Values.backup.external_ceph_rbd.enabled }} -- external-backup-ceph.conf: {{ include "helm-toolkit.utils.to_ini" .Values.backup.external_ceph_rbd.conf | b64enc }} -+ external-backup-ceph.conf: | -+{{ include "helm-toolkit.utils.to_ini" .Values.backup.external_ceph_rbd.conf | indent 4 }} - {{- end }} - {{- end }} -diff --git a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml -index 5d7ed3c..42ea01d 100644 ---- a/cinder/templates/cron-job-cinder-volume-usage-audit.yaml -+++ b/cinder/templates/cron-job-cinder-volume-usage-audit.yaml -@@ -73,8 +73,8 @@ spec: - - name: etccinder - emptyDir: {} - - name: cinder-etc -- secret: -- secretName: cinder-etc -+ configMap: -+ name: cinder-etc - defaultMode: 0444 - - name: cinder-bin - configMap: -diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml -index 9213d34..629dc6b 100644 ---- a/cinder/templates/deployment-api.yaml -+++ b/cinder/templates/deployment-api.yaml -@@ -120,8 +120,8 @@ spec: - name: cinder-bin - defaultMode: 0555 - - name: cinder-etc -- secret: -- secretName: cinder-etc -+ configMap: -+ name: cinder-etc - defaultMode: 0444 - {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} - #NOTE (portdirect): this will need to be set to a shared mount amongst all cinder -diff --git a/cinder/templates/deployment-backup.yaml b/cinder/templates/deployment-backup.yaml -index d978b3a..181f132 100644 ---- a/cinder/templates/deployment-backup.yaml -+++ b/cinder/templates/deployment-backup.yaml -@@ -197,8 +197,8 @@ spec: - {{ if $mounts_cinder_backup.volumeMounts }}{{ toYaml $mounts_cinder_backup.volumeMounts | indent 12 }}{{ end }} - volumes: - - name: cinder-etc -- secret: -- secretName: cinder-etc -+ configMap: -+ name: cinder-etc - defaultMode: 0444 - - name: cinder-bin - configMap: -diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml -index c60e13b..fb8512f 100644 ---- a/cinder/templates/deployment-scheduler.yaml -+++ b/cinder/templates/deployment-scheduler.yaml -@@ -106,8 +106,8 @@ spec: - name: cinder-bin - defaultMode: 0555 - - name: cinder-etc -- secret: -- secretName: cinder-etc -+ configMap: -+ name: cinder-etc - defaultMode: 0444 - {{- if eq ( split "://" .Values.conf.cinder.coordination.backend_url )._0 "file" }} - #NOTE (portdirect): this will need to be set to a shared mount amongst all cinder -diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml -index 46d13fd..7a1e7d5 100644 ---- a/cinder/templates/deployment-volume.yaml -+++ b/cinder/templates/deployment-volume.yaml -@@ -161,9 +161,8 @@ spec: - name: cinder-bin - defaultMode: 0555 - - name: cinder-etc -- secret: -- secretName: cinder-etc -- defaultMode: 0444 -+ configMap: -+ name: cinder-etc - {{- if include "cinder.utils.is_ceph_volume_configured" $envAll }} - - name: etcceph - emptyDir: {} -diff --git a/cinder/templates/job-backup-storage-init.yaml b/cinder/templates/job-backup-storage-init.yaml -index dcb756a..a2f7255 100644 ---- a/cinder/templates/job-backup-storage-init.yaml -+++ b/cinder/templates/job-backup-storage-init.yaml -@@ -161,8 +161,8 @@ spec: - defaultMode: 0444 - {{- if .Values.backup.external_ceph_rbd.enabled }} - - name: cinder-etc -- secret: -- secretName: cinder-etc -+ configMap: -+ name: cinder-etc - defaultMode: 0444 - {{- end }} - {{- if empty .Values.conf.ceph.admin_keyring }} -diff --git a/cinder/templates/pod-rally-test.yaml b/cinder/templates/pod-rally-test.yaml -index f24e5aa..630e97b 100644 ---- a/cinder/templates/pod-rally-test.yaml -+++ b/cinder/templates/pod-rally-test.yaml -@@ -89,8 +89,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: cinder-etc -- secret: -- secretName: cinder-etc -+ configMap: -+ name: cinder-etc - defaultMode: 0444 - - name: cinder-bin - configMap: -diff --git a/congress/templates/configmap-etc.yaml b/congress/templates/configmap-etc.yaml -index 4b4fd05..0996efd 100644 ---- a/congress/templates/configmap-etc.yaml -+++ b/congress/templates/configmap-etc.yaml -@@ -77,13 +77,16 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: congress-etc --type: Opaque - data: -- congress.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.congress | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -+ congress.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.congress | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} - {{- end }} -diff --git a/congress/templates/deployment-api.yaml b/congress/templates/deployment-api.yaml -index d635ce1..a78d9bc 100644 ---- a/congress/templates/deployment-api.yaml -+++ b/congress/templates/deployment-api.yaml -@@ -91,7 +91,7 @@ spec: - name: congress-bin - defaultMode: 0777 - - name: congress-etc -- secret: -- secretName: congress-etc -+ configMap: -+ name: congress-etc - defaultMode: 0444 - {{ end }} -diff --git a/congress/templates/deployment-datasource.yaml b/congress/templates/deployment-datasource.yaml -index 97cff78..5eeba89 100644 ---- a/congress/templates/deployment-datasource.yaml -+++ b/congress/templates/deployment-datasource.yaml -@@ -85,8 +85,8 @@ spec: - name: congress-bin - defaultMode: 0555 - - name: congress-etc -- secret: -- secretName: congress-etc -+ configMap: -+ name: congress-etc - defaultMode: 0444 - - {{ end }} -diff --git a/congress/templates/deployment-policy-engine.yaml b/congress/templates/deployment-policy-engine.yaml -index 77c233f..d3f1bd8 100644 ---- a/congress/templates/deployment-policy-engine.yaml -+++ b/congress/templates/deployment-policy-engine.yaml -@@ -85,8 +85,8 @@ spec: - name: congress-bin - defaultMode: 0555 - - name: congress-etc -- secret: -- secretName: congress-etc -+ configMap: -+ name: congress-etc - defaultMode: 0444 - - {{ end }} -diff --git a/glance/templates/configmap-etc.yaml b/glance/templates/configmap-etc.yaml -index 3c922db..c3d2f72 100644 ---- a/glance/templates/configmap-etc.yaml -+++ b/glance/templates/configmap-etc.yaml -@@ -158,17 +158,23 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: glance-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- glance-api.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- glance-api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- glance-registry.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | b64enc }} -- glance-registry-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} --{{- include "helm-toolkit.snippets.values_template_renderer" ( dict "envAll" $envAll "template" .Values.conf.swift_store "key" "swift-store.conf" "format" "Secret" ) | indent 2 }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ glance-api.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ glance-api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ glance-registry.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.glance_registry | indent 4 }} -+ glance-registry-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste_registry | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.swift_store "key" "swift-store.conf") | indent 2 }} - {{- end }} -diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml -index 31316c7..634ceeb 100644 ---- a/glance/templates/deployment-api.yaml -+++ b/glance/templates/deployment-api.yaml -@@ -159,8 +159,8 @@ spec: - name: glance-bin - defaultMode: 0555 - - name: glance-etc -- secret: -- secretName: glance-etc -+ configMap: -+ name: glance-etc - defaultMode: 0444 - {{- if eq .Values.storage "pvc" }} - - name: glance-images -diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml -index cf296e7..5a4f614 100644 ---- a/glance/templates/deployment-registry.yaml -+++ b/glance/templates/deployment-registry.yaml -@@ -106,8 +106,8 @@ spec: - name: glance-bin - defaultMode: 0555 - - name: glance-etc -- secret: -- secretName: glance-etc -+ configMap: -+ name: glance-etc - defaultMode: 0444 - {{ if $mounts_glance_registry.volumes }}{{ toYaml $mounts_glance_registry.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/glance/templates/pod-rally-test.yaml b/glance/templates/pod-rally-test.yaml -index a0f992f..a807b83 100644 ---- a/glance/templates/pod-rally-test.yaml -+++ b/glance/templates/pod-rally-test.yaml -@@ -88,8 +88,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: glance-etc -- secret: -- secretName: glance-etc -+ configMap: -+ name: glance-etc - defaultMode: 0444 - - name: glance-bin - configMap: -diff --git a/heat/templates/configmap-etc.yaml b/heat/templates/configmap-etc.yaml -index e89012d..7d56528 100644 ---- a/heat/templates/configmap-etc.yaml -+++ b/heat/templates/configmap-etc.yaml -@@ -134,17 +134,22 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: heat-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- heat.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.heat | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ heat.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.heat | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} - {{- range $key, $value := $envAll.Values.conf.rally_tests.templates }} -- {{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }} -+ {{ printf "test_template_%d" $key }}: | -+{{ $value.template | indent 4 }} - {{- end }} - {{- end }} -diff --git a/heat/templates/cron-job-engine-cleaner.yaml b/heat/templates/cron-job-engine-cleaner.yaml -index 986023f..77f8443 100644 ---- a/heat/templates/cron-job-engine-cleaner.yaml -+++ b/heat/templates/cron-job-engine-cleaner.yaml -@@ -73,8 +73,8 @@ spec: - - name: etcheat - emptyDir: {} - - name: heat-etc -- secret: -- secretName: heat-etc -+ configMap: -+ name: heat-etc - defaultMode: 0444 - - name: heat-bin - configMap: -diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml -index e4799b2..be4c13f 100644 ---- a/heat/templates/deployment-api.yaml -+++ b/heat/templates/deployment-api.yaml -@@ -106,8 +106,8 @@ spec: - name: heat-bin - defaultMode: 0555 - - name: heat-etc -- secret: -- secretName: heat-etc -+ configMap: -+ name: heat-etc - defaultMode: 0444 - {{ if $mounts_heat_api.volumes }}{{ toYaml $mounts_heat_api.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml -index 81b165a..06fd278 100644 ---- a/heat/templates/deployment-cfn.yaml -+++ b/heat/templates/deployment-cfn.yaml -@@ -106,8 +106,8 @@ spec: - name: heat-bin - defaultMode: 0555 - - name: heat-etc -- secret: -- secretName: heat-etc -+ configMap: -+ name: heat-etc - defaultMode: 0444 - {{ if $mounts_heat_cfn.volumes }}{{ toYaml $mounts_heat_cfn.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml -index a93baba..e452b97 100644 ---- a/heat/templates/deployment-cloudwatch.yaml -+++ b/heat/templates/deployment-cloudwatch.yaml -@@ -106,8 +106,8 @@ spec: - name: heat-bin - defaultMode: 0555 - - name: heat-etc -- secret: -- secretName: heat-etc -+ configMap: -+ name: heat-etc - defaultMode: 0444 - {{ if $mounts_heat_cloudwatch.volumes }}{{ toYaml $mounts_heat_cloudwatch.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/heat/templates/deployment-engine.yaml b/heat/templates/deployment-engine.yaml -index a68939a..63d4543 100644 ---- a/heat/templates/deployment-engine.yaml -+++ b/heat/templates/deployment-engine.yaml -@@ -104,8 +104,8 @@ spec: - name: heat-bin - defaultMode: 0555 - - name: heat-etc -- secret: -- secretName: heat-etc -+ configMap: -+ name: heat-etc - defaultMode: 0444 - {{ if $mounts_heat_engine.volumes }}{{ toYaml $mounts_heat_engine.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/heat/templates/pod-rally-test.yaml b/heat/templates/pod-rally-test.yaml -index 2db25a3..3ddc6d3 100644 ---- a/heat/templates/pod-rally-test.yaml -+++ b/heat/templates/pod-rally-test.yaml -@@ -95,8 +95,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: heat-etc -- secret: -- secretName: heat-etc -+ configMap: -+ name: heat-etc - defaultMode: 0444 - - name: heat-bin - configMap: -diff --git a/horizon/templates/configmap-etc.yaml b/horizon/templates/configmap-etc.yaml -index bfdfc18..dc695a1 100644 ---- a/horizon/templates/configmap-etc.yaml -+++ b/horizon/templates/configmap-etc.yaml -@@ -18,14 +18,14 @@ limitations under the License. - {{- $envAll := . }} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: horizon-etc --type: Opaque - data: --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.apache "key" "horizon.conf" "format" "Secret" ) | indent 2 }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.local_settings.template "key" "local_settings" "format" "Secret" ) | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.apache "key" "horizon.conf") | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.horizon.local_settings.template "key" "local_settings") | indent 2 }} - {{- range $key, $value := .Values.conf.horizon.policy }} -- {{ printf "%s_policy.json" $key }}: {{ $value | toPrettyJson | b64enc }} -+ {{ printf "%s_policy.json" $key }}: | -+{{ $value | toPrettyJson | indent 4 }} - {{- end }} - {{- end }} -diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml -index fe6b8da..2a76226 100644 ---- a/horizon/templates/deployment.yaml -+++ b/horizon/templates/deployment.yaml -@@ -119,8 +119,8 @@ spec: - name: horizon-bin - defaultMode: 0555 - - name: horizon-etc -- secret: -- secretName: horizon-etc -+ configMap: -+ name: horizon-etc - defaultMode: 0444 - {{ if $mounts_horizon.volumes }}{{ toYaml $mounts_horizon.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/horizon/templates/job-db-sync.yaml b/horizon/templates/job-db-sync.yaml -index 893428c..eefdb44 100644 ---- a/horizon/templates/job-db-sync.yaml -+++ b/horizon/templates/job-db-sync.yaml -@@ -63,8 +63,8 @@ spec: - {{ if $mounts_horizon_db_sync.volumeMounts }}{{ toYaml $mounts_horizon_db_sync.volumeMounts | indent 10 }}{{ end }} - volumes: - - name: horizon-etc -- secret: -- secretName: horizon-etc -+ configMap: -+ name: horizon-etc - defaultMode: 0444 - - name: horizon-bin - configMap: -diff --git a/ironic/templates/configmap-etc.yaml b/ironic/templates/configmap-etc.yaml -index 613e4bf..d0a62d5 100644 ---- a/ironic/templates/configmap-etc.yaml -+++ b/ironic/templates/configmap-etc.yaml -@@ -198,14 +198,16 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: ironic-etc --type: Opaque - data: -- ironic.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.tftp_map_file "key" "tftp-map-file" "format" "Secret" ) | indent 2 }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.nginx "key" "nginx.conf" "format" "Secret" ) | indent 2 }} -+ ironic.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.ironic | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.tftp_map_file "key" "tftp-map-file") | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.nginx "key" "nginx.conf") | indent 2 }} - {{- end }} -diff --git a/ironic/templates/deployment-api.yaml b/ironic/templates/deployment-api.yaml -index 9498d58..2ef3631 100644 ---- a/ironic/templates/deployment-api.yaml -+++ b/ironic/templates/deployment-api.yaml -@@ -132,8 +132,8 @@ spec: - name: ironic-bin - defaultMode: 0555 - - name: ironic-etc -- secret: -- secretName: ironic-etc -+ configMap: -+ name: ironic-etc - defaultMode: 0444 - - name: pod-shared - emptyDir: {} -diff --git a/ironic/templates/statefulset-conductor.yaml b/ironic/templates/statefulset-conductor.yaml -index 073690f..1f3036e 100644 ---- a/ironic/templates/statefulset-conductor.yaml -+++ b/ironic/templates/statefulset-conductor.yaml -@@ -221,8 +221,8 @@ spec: - name: ironic-bin - defaultMode: 0555 - - name: ironic-etc -- secret: -- secretName: ironic-etc -+ configMap: -+ name: ironic-etc - defaultMode: 0444 - - name: host-var-lib-ironic - hostPath: -diff --git a/keystone/templates/configmap-etc.yaml b/keystone/templates/configmap-etc.yaml -index 5e7721b..edd97d9 100644 ---- a/keystone/templates/configmap-etc.yaml -+++ b/keystone/templates/configmap-etc.yaml -@@ -43,21 +43,26 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: keystone-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- keystone.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.logging | b64enc }} -- keystone-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -- ports.conf: '' -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ keystone.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.keystone | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.logging | indent 4 }} -+ keystone-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} -+ ports.conf: "" - {{- range $k, $v := .Values.conf.ks_domains }} -- keystone.{{ $k }}.json: {{ toJson $v | b64enc }} -+ keystone.{{ $k }}.json: | -+{{ toJson $v | indent 4 }} - {{- end }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.mpm_event "key" "mpm_event.conf" "format" "Secret" ) | indent 2 }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_keystone "key" "wsgi-keystone.conf" "format" "Secret" ) | indent 2 }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.sso_callback_template "key" "sso_callback_template.html" "format" "Secret" ) | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.mpm_event "key" "mpm_event.conf") | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_keystone "key" "wsgi-keystone.conf") | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.sso_callback_template "key" "sso_callback_template.html") | indent 2 }} - {{- end }} -diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml -index 9249675..2dcd47a 100644 ---- a/keystone/templates/cron-job-credential-rotate.yaml -+++ b/keystone/templates/cron-job-credential-rotate.yaml -@@ -114,8 +114,8 @@ spec: - - name: etckeystone - emptyDir: {} - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml -index a61339e..353dfc2 100644 ---- a/keystone/templates/cron-job-fernet-rotate.yaml -+++ b/keystone/templates/cron-job-fernet-rotate.yaml -@@ -113,8 +113,8 @@ spec: - - name: etckeystone - emptyDir: {} - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml -index c985cad..927ace0 100644 ---- a/keystone/templates/deployment-api.yaml -+++ b/keystone/templates/deployment-api.yaml -@@ -147,8 +147,8 @@ spec: - - name: run-apache - emptyDir: {} - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml -index 4a212dc..b177b95 100644 ---- a/keystone/templates/job-credential-setup.yaml -+++ b/keystone/templates/job-credential-setup.yaml -@@ -89,8 +89,6 @@ spec: - volumeMounts: - - name: etckeystone - mountPath: /etc/keystone -- - name: credential-keys -- mountPath: {{ .Values.conf.keystone.credential.key_repository | quote }} - - name: keystone-etc - mountPath: /etc/keystone/keystone.conf - subPath: keystone.conf -@@ -107,11 +105,9 @@ spec: - volumes: - - name: etckeystone - emptyDir: {} -- - name: credential-keys -- emptyDir: {} - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml -index a2c8be8..df0bd03 100644 ---- a/keystone/templates/job-domain-manage.yaml -+++ b/keystone/templates/job-domain-manage.yaml -@@ -103,8 +103,8 @@ spec: - - name: etckeystonedomains - emptyDir: {} - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml -index ebe9f21..58cd0a3 100644 ---- a/keystone/templates/job-fernet-setup.yaml -+++ b/keystone/templates/job-fernet-setup.yaml -@@ -88,8 +88,6 @@ spec: - volumeMounts: - - name: etckeystone - mountPath: /etc/keystone -- - name: fernet-keys -- mountPath: {{ .Values.conf.keystone.fernet_tokens.key_repository | quote }} - - name: keystone-etc - mountPath: /etc/keystone/keystone.conf - subPath: keystone.conf -@@ -106,11 +104,9 @@ spec: - volumes: - - name: etckeystone - emptyDir: {} -- - name: fernet-keys -- emptyDir: {} - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/keystone/templates/pod-rally-test.yaml b/keystone/templates/pod-rally-test.yaml -index d29bc0e..e68cef2 100644 ---- a/keystone/templates/pod-rally-test.yaml -+++ b/keystone/templates/pod-rally-test.yaml -@@ -87,8 +87,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: keystone-etc -- secret: -- secretName: keystone-etc -+ configMap: -+ name: keystone-etc - defaultMode: 0444 - - name: keystone-bin - configMap: -diff --git a/magnum/templates/configmap-etc.yaml b/magnum/templates/configmap-etc.yaml -index 7796fa0..677abfc 100644 ---- a/magnum/templates/configmap-etc.yaml -+++ b/magnum/templates/configmap-etc.yaml -@@ -87,13 +87,16 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: magnum-etc --type: Opaque - data: -- magnum.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.magnum | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -+ magnum.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.magnum | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} - {{- end }} -diff --git a/magnum/templates/deployment-api.yaml b/magnum/templates/deployment-api.yaml -index 8015927..eb70e63 100644 ---- a/magnum/templates/deployment-api.yaml -+++ b/magnum/templates/deployment-api.yaml -@@ -116,8 +116,8 @@ spec: - name: magnum-bin - defaultMode: 0555 - - name: magnum-etc -- secret: -- secretName: magnum-etc -+ configMap: -+ name: magnum-etc - defaultMode: 0444 - - name: magnum-lock-path - emptyDir: {} -diff --git a/magnum/templates/statefulset-conductor.yaml b/magnum/templates/statefulset-conductor.yaml -index 2c6f094..b8de04f 100644 ---- a/magnum/templates/statefulset-conductor.yaml -+++ b/magnum/templates/statefulset-conductor.yaml -@@ -111,8 +111,8 @@ spec: - name: magnum-bin - defaultMode: 0555 - - name: magnum-etc -- secret: -- secretName: magnum-etc -+ configMap: -+ name: magnum-etc - defaultMode: 0444 - - name: magnum-lock-path - emptyDir: {} -diff --git a/mistral/templates/configmap-etc.yaml b/mistral/templates/configmap-etc.yaml -index 2e24c76..133cce3 100644 ---- a/mistral/templates/configmap-etc.yaml -+++ b/mistral/templates/configmap-etc.yaml -@@ -77,16 +77,20 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: mistral-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- mistral.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.mistral | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ mistral.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.mistral | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} - {{- range $key, $value := $envAll.Values.conf.rally_tests.templates }} -- {{ printf "test_template_%d" $key }}: {{ $value.template | b64enc }} -+ {{ printf "test_template_%d" $key }}: | -+{{ $value.template | indent 4 }} - {{- end }} - {{- end }} -diff --git a/mistral/templates/deployment-api.yaml b/mistral/templates/deployment-api.yaml -index 0b5087c..d3b361d 100644 ---- a/mistral/templates/deployment-api.yaml -+++ b/mistral/templates/deployment-api.yaml -@@ -102,8 +102,8 @@ spec: - name: mistral-bin - defaultMode: 0555 - - name: mistral-etc -- secret: -- secretName: mistral-etc -+ configMap: -+ name: mistral-etc - defaultMode: 0444 - {{ if $mounts_mistral_api.volumes }}{{ toYaml $mounts_mistral_api.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/mistral/templates/deployment-executor.yaml b/mistral/templates/deployment-executor.yaml -index c66d22f..53234ab 100644 ---- a/mistral/templates/deployment-executor.yaml -+++ b/mistral/templates/deployment-executor.yaml -@@ -84,8 +84,8 @@ spec: - name: mistral-bin - defaultMode: 0555 - - name: mistral-etc -- secret: -- secretName: mistral-etc -+ configMap: -+ name: mistral-etc - defaultMode: 0444 - {{ if $mounts_mistral_executor.volumes }}{{ toYaml $mounts_mistral_executor.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/mistral/templates/pod-rally-test.yaml b/mistral/templates/pod-rally-test.yaml -index 70f85d9..2968c70 100644 ---- a/mistral/templates/pod-rally-test.yaml -+++ b/mistral/templates/pod-rally-test.yaml -@@ -95,8 +95,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: mistral-etc -- secret: -- secretName: mistral-etc -+ configMap: -+ name: mistral-etc - defaultMode: 0444 - - name: mistral-bin - configMap: -diff --git a/mistral/templates/statefulset-engine.yaml b/mistral/templates/statefulset-engine.yaml -index 2b8e105..13def09 100644 ---- a/mistral/templates/statefulset-engine.yaml -+++ b/mistral/templates/statefulset-engine.yaml -@@ -81,8 +81,8 @@ spec: - name: mistral-bin - defaultMode: 0555 - - name: mistral-etc -- secret: -- secretName: mistral-etc -+ configMap: -+ name: mistral-etc - defaultMode: 0444 - {{ if $mounts_mistral_engine.volumes }}{{ toYaml $mounts_mistral_engine.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/mistral/templates/statefulset-event-engine.yaml b/mistral/templates/statefulset-event-engine.yaml -index bb2acb3..b9576c5 100644 ---- a/mistral/templates/statefulset-event-engine.yaml -+++ b/mistral/templates/statefulset-event-engine.yaml -@@ -81,8 +81,8 @@ spec: - name: mistral-bin - defaultMode: 0555 - - name: mistral-etc -- secret: -- secretName: mistral-etc -+ configMap: -+ name: mistral-etc - defaultMode: 0444 - {{ if $mounts_mistral_event_engine.volumes }}{{ toYaml $mounts_mistral_event_engine.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/mistral/values.yaml b/mistral/values.yaml -index d9e461e..9634c11 100644 ---- a/mistral/values.yaml -+++ b/mistral/values.yaml -@@ -459,7 +459,7 @@ conf: - port: null - api_workers: 8 - coordination: -- backend_url: "" -+ backend_url: null - database: - max_retries: -1 - keystone_authtoken: -diff --git a/neutron/templates/configmap-etc.yaml b/neutron/templates/configmap-etc.yaml -index 7293df0..ffed59c 100644 ---- a/neutron/templates/configmap-etc.yaml -+++ b/neutron/templates/configmap-etc.yaml -@@ -171,32 +171,49 @@ just set it along with nova_metadata_host. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: {{ $configMapName }} --type: Opaque - data: -- rally_tests.yaml: {{ toYaml $envAll.Values.conf.rally_tests.tests | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" $envAll.Values.conf.paste | b64enc }} -- policy.json: {{ toJson $envAll.Values.conf.policy | b64enc }} -- neutron.conf: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.neutron | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- dhcp_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.dhcp_agent | b64enc }} -- l3_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.l3_agent | b64enc }} -- metadata_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metadata_agent | b64enc }} -- metering_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metering_agent | b64enc }} -- ml2_conf.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf | b64enc }} -- ml2_conf_sriov.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf_sriov | b64enc }} -- macvtap_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.macvtap_agent | b64enc }} -- linuxbridge_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.linuxbridge_agent | b64enc }} -- openvswitch_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.openvswitch_agent | b64enc }} -- sriov_agent.ini: {{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.sriov_agent | b64enc }} -+ rally_tests.yaml: | -+{{ toYaml $envAll.Values.conf.rally_tests.tests | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" $envAll.Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson $envAll.Values.conf.policy | indent 4 }} -+ neutron.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.neutron | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ dhcp_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.dhcp_agent | indent 4 }} -+ l3_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.l3_agent | indent 4 }} -+ metadata_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metadata_agent | indent 4 }} -+ metering_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.metering_agent | indent 4 }} -+ ml2_conf.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf | indent 4 }} -+ ml2_conf_sriov.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.ml2_conf_sriov | indent 4 }} -+ macvtap_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.macvtap_agent | indent 4 }} -+ linuxbridge_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.linuxbridge_agent | indent 4 }} -+ openvswitch_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.openvswitch_agent | indent 4 }} -+ sriov_agent.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" $envAll.Values.conf.plugins.sriov_agent | indent 4 }} - dnsmasq.conf: "" -- neutron_sudoers: {{ $envAll.Values.conf.neutron_sudoers | b64enc }} -- rootwrap.conf: {{ $envAll.Values.conf.rootwrap | b64enc }} -+ neutron_sudoers: | -+{{ $envAll.Values.conf.neutron_sudoers | indent 4 }} -+ rootwrap.conf: | -+{{ $envAll.Values.conf.rootwrap | indent 4 }} - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- $filePrefix := replace "_" "-" $key }} -- {{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }} -+ {{ printf "%s.filters" $filePrefix }}: | -+{{ $value.content | indent 4 }} - {{- end }} - {{- end }} - {{- end }} -diff --git a/neutron/templates/daemonset-dhcp-agent.yaml b/neutron/templates/daemonset-dhcp-agent.yaml -index e7d84aa..a45c08b 100644 ---- a/neutron/templates/daemonset-dhcp-agent.yaml -+++ b/neutron/templates/daemonset-dhcp-agent.yaml -@@ -137,8 +137,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - - name: socket - hostPath: -diff --git a/neutron/templates/daemonset-l3-agent.yaml b/neutron/templates/daemonset-l3-agent.yaml -index ac0a3f7..d91bef3 100644 ---- a/neutron/templates/daemonset-l3-agent.yaml -+++ b/neutron/templates/daemonset-l3-agent.yaml -@@ -136,8 +136,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - - name: libmodules - hostPath: -diff --git a/neutron/templates/daemonset-lb-agent.yaml b/neutron/templates/daemonset-lb-agent.yaml -index 7730ab4..bf209a6 100644 ---- a/neutron/templates/daemonset-lb-agent.yaml -+++ b/neutron/templates/daemonset-lb-agent.yaml -@@ -196,8 +196,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - - name: run - hostPath: -diff --git a/neutron/templates/daemonset-metadata-agent.yaml b/neutron/templates/daemonset-metadata-agent.yaml -index 2a24aa6..c5e65d8 100644 ---- a/neutron/templates/daemonset-metadata-agent.yaml -+++ b/neutron/templates/daemonset-metadata-agent.yaml -@@ -150,8 +150,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - - name: socket - hostPath: -diff --git a/neutron/templates/daemonset-ovs-agent.yaml b/neutron/templates/daemonset-ovs-agent.yaml -index 3ca1ca3..04a29e1 100644 ---- a/neutron/templates/daemonset-ovs-agent.yaml -+++ b/neutron/templates/daemonset-ovs-agent.yaml -@@ -200,8 +200,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - - name: run - hostPath: -diff --git a/neutron/templates/daemonset-sriov-agent.yaml b/neutron/templates/daemonset-sriov-agent.yaml -index 6130817..e1213a7 100644 ---- a/neutron/templates/daemonset-sriov-agent.yaml -+++ b/neutron/templates/daemonset-sriov-agent.yaml -@@ -173,8 +173,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - - name: run - hostPath: -diff --git a/neutron/templates/deployment-server.yaml b/neutron/templates/deployment-server.yaml -index 31dec3d..628937b 100644 ---- a/neutron/templates/deployment-server.yaml -+++ b/neutron/templates/deployment-server.yaml -@@ -115,8 +115,8 @@ spec: - name: neutron-bin - defaultMode: 0555 - - name: neutron-etc -- secret: -- secretName: neutron-etc -+ configMap: -+ name: neutron-etc - defaultMode: 0444 - {{ if $mounts_neutron_server.volumes }}{{ toYaml $mounts_neutron_server.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/neutron/templates/pod-rally-test.yaml b/neutron/templates/pod-rally-test.yaml -index 15633d1..16ced6e 100644 ---- a/neutron/templates/pod-rally-test.yaml -+++ b/neutron/templates/pod-rally-test.yaml -@@ -90,8 +90,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: neutron-etc -- secret: -- secretName: neutron-etc -+ configMap: -+ name: neutron-etc - defaultMode: 0444 - - name: neutron-bin - configMap: -diff --git a/nova/templates/configmap-etc.yaml b/nova/templates/configmap-etc.yaml -index d1a55f5..cbd69ee 100644 ---- a/nova/templates/configmap-etc.yaml -+++ b/nova/templates/configmap-etc.yaml -@@ -214,26 +214,34 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: {{ $configMapName }} --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | b64enc }} -- policy.yaml: {{ toYaml .Values.conf.policy | b64enc }} -- nova_sudoers: {{ $envAll.Values.conf.nova_sudoers | b64enc }} -- rootwrap.conf: {{ .Values.conf.rootwrap | b64enc }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.paste | indent 4 }} -+ policy.yaml: | -+{{ toYaml .Values.conf.policy | indent 4 }} -+ nova_sudoers: | -+{{ $envAll.Values.conf.nova_sudoers | indent 4 }} -+ rootwrap.conf: | -+{{- .Values.conf.rootwrap | indent 4 }} - {{- range $key, $value := $envAll.Values.conf.rootwrap_filters }} - {{- $filePrefix := replace "_" "-" $key }} -- {{ printf "%s.filters" $filePrefix }}: {{ $value.content | b64enc }} -+ {{ printf "%s.filters" $filePrefix }}: | -+{{ $value.content | indent 4 }} - {{- end }} -- nova.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- nova-ironic.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova_ironic | b64enc }} --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_placement "key" "wsgi-nova-placement.conf" "format" "Secret" ) | indent 2 }} -+ nova.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ nova-ironic.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.nova_ironic | indent 4 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_placement "key" "wsgi-nova-placement.conf" ) | indent 2 }} - # FIXME(portdirect): why is this file suffixed .sh? --{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.ssh "key" "ssh-config.sh" "format" "Secret" ) | indent 2 }} -+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.ssh "key" "ssh-config.sh" ) | indent 2 }} - {{- end }} - {{- end }} - {{- if .Values.manifests.configmap_etc }} -diff --git a/nova/templates/cron-job-cell-setup.yaml b/nova/templates/cron-job-cell-setup.yaml -index 66df4df..dd71748 100644 ---- a/nova/templates/cron-job-cell-setup.yaml -+++ b/nova/templates/cron-job-cell-setup.yaml -@@ -76,8 +76,8 @@ spec: - - name: etcnova - emptyDir: {} - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: nova-bin - configMap: -diff --git a/nova/templates/cron-job-service-cleaner.yaml b/nova/templates/cron-job-service-cleaner.yaml -index 889cfc4..db36ae6 100644 ---- a/nova/templates/cron-job-service-cleaner.yaml -+++ b/nova/templates/cron-job-service-cleaner.yaml -@@ -65,8 +65,8 @@ spec: - - name: etcnova - emptyDir: {} - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: nova-bin - configMap: -diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml -index 850f0b0..ae681bb 100644 ---- a/nova/templates/daemonset-compute.yaml -+++ b/nova/templates/daemonset-compute.yaml -@@ -292,8 +292,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: {{ $configMapName }} -+ configMap: -+ name: {{ $configMapName }} - defaultMode: 0444 - {{- if .Values.conf.ceph.enabled }} - - name: etcceph -diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml -index dfc9947..5b55950 100644 ---- a/nova/templates/deployment-api-metadata.yaml -+++ b/nova/templates/deployment-api-metadata.yaml -@@ -155,8 +155,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: pod-shared - emptyDir: {} -diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml -index f0aa805..263d3a8 100644 ---- a/nova/templates/deployment-api-osapi.yaml -+++ b/nova/templates/deployment-api-osapi.yaml -@@ -102,8 +102,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - {{ if $mounts_nova_api_osapi.volumes}}{{ toYaml $mounts_nova_api_osapi.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml -index 7bf0841..36c326f 100644 ---- a/nova/templates/deployment-conductor.yaml -+++ b/nova/templates/deployment-conductor.yaml -@@ -84,8 +84,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - {{ if $mounts_nova_conductor.volumes }}{{ toYaml $mounts_nova_conductor.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml -index 10de3fc..2a42917 100644 ---- a/nova/templates/deployment-consoleauth.yaml -+++ b/nova/templates/deployment-consoleauth.yaml -@@ -84,8 +84,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - {{ if $mounts_nova_consoleauth.volumes }}{{ toYaml $mounts_nova_consoleauth.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml -index 85e0e11..992650b 100644 ---- a/nova/templates/deployment-novncproxy.yaml -+++ b/nova/templates/deployment-novncproxy.yaml -@@ -122,8 +122,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: pod-usr-share-novnc - emptyDir: {} -diff --git a/nova/templates/deployment-placement.yaml b/nova/templates/deployment-placement.yaml -index db62d75..4838f93 100644 ---- a/nova/templates/deployment-placement.yaml -+++ b/nova/templates/deployment-placement.yaml -@@ -111,8 +111,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - {{- if $mounts_nova_placement.volumes }}{{ toYaml $mounts_nova_placement.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml -index dc8b0d3..018566f 100644 ---- a/nova/templates/deployment-scheduler.yaml -+++ b/nova/templates/deployment-scheduler.yaml -@@ -84,8 +84,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - {{ if $mounts_nova_scheduler.volumes }}{{ toYaml $mounts_nova_scheduler.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/nova/templates/deployment-spiceproxy.yaml b/nova/templates/deployment-spiceproxy.yaml -index 65fa900..351d54f 100644 ---- a/nova/templates/deployment-spiceproxy.yaml -+++ b/nova/templates/deployment-spiceproxy.yaml -@@ -122,8 +122,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: pod-usr-share-spice-html5 - emptyDir: {} -diff --git a/nova/templates/job-cell-setup.yaml b/nova/templates/job-cell-setup.yaml -index 4ad9509..ffabd1f 100644 ---- a/nova/templates/job-cell-setup.yaml -+++ b/nova/templates/job-cell-setup.yaml -@@ -81,8 +81,8 @@ spec: - - name: etcnova - emptyDir: {} - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: nova-bin - configMap: -diff --git a/nova/templates/pod-rally-test.yaml b/nova/templates/pod-rally-test.yaml -index f7b2e1b..05e0558 100644 ---- a/nova/templates/pod-rally-test.yaml -+++ b/nova/templates/pod-rally-test.yaml -@@ -89,8 +89,8 @@ spec: - {{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }} - volumes: - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: nova-bin - configMap: -diff --git a/nova/templates/statefulset-compute-ironic.yaml b/nova/templates/statefulset-compute-ironic.yaml -index eb39dd8..19cd9fe 100644 ---- a/nova/templates/statefulset-compute-ironic.yaml -+++ b/nova/templates/statefulset-compute-ironic.yaml -@@ -97,8 +97,8 @@ spec: - name: nova-bin - defaultMode: 0555 - - name: nova-etc -- secret: -- secretName: nova-etc -+ configMap: -+ name: nova-etc - defaultMode: 0444 - - name: varlibironic - hostPath: -diff --git a/rally/templates/configmap-etc.yaml b/rally/templates/configmap-etc.yaml -index 2bbe5fe..afa651f 100644 ---- a/rally/templates/configmap-etc.yaml -+++ b/rally/templates/configmap-etc.yaml -@@ -54,10 +54,10 @@ limitations under the License. - - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: rally-etc --type: Opaque - data: -- rally.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.rally | b64enc }} -+ rally.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.rally | indent 4 }} - {{- end }} -diff --git a/rally/templates/job-manage-db.yaml b/rally/templates/job-manage-db.yaml -index 7510e69..82a2188 100644 ---- a/rally/templates/job-manage-db.yaml -+++ b/rally/templates/job-manage-db.yaml -@@ -59,8 +59,8 @@ spec: - - name: etcrally - emptyDir: {} - - name: rally-etc -- secret: -- secretName: rally-etc -+ configMap: -+ name: rally-etc - defaultMode: 0444 - - name: rally-bin - configMap: -diff --git a/rally/templates/job-run-task.yaml b/rally/templates/job-run-task.yaml -index ed14757..2b091d5 100644 ---- a/rally/templates/job-run-task.yaml -+++ b/rally/templates/job-run-task.yaml -@@ -86,8 +86,8 @@ spec: - - name: etcrally - emptyDir: {} - - name: rally-etc -- secret: -- secretName: rally-etc -+ configMap: -+ name: rally-etc - defaultMode: 0444 - - name: rally-tasks - configMap: -diff --git a/senlin/templates/configmap-etc.yaml b/senlin/templates/configmap-etc.yaml -index 027b468..cf9477a 100644 ---- a/senlin/templates/configmap-etc.yaml -+++ b/senlin/templates/configmap-etc.yaml -@@ -97,14 +97,18 @@ limitations under the License. - {{- end -}} - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: senlin-etc --type: Opaque - data: -- rally_tests.yaml: {{ toYaml .Values.conf.rally_tests.tests | b64enc }} -- senlin.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.senlin | b64enc }} -- logging.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | b64enc }} -- api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }} -- policy.json: {{ toJson .Values.conf.policy | b64enc }} -+ rally_tests.yaml: | -+{{ toYaml .Values.conf.rally_tests.tests | indent 4 }} -+ senlin.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.senlin | indent 4 }} -+ logging.conf: | -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.logging | indent 4 }} -+ api-paste.ini: | -+{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} -+ policy.json: | -+{{ toJson .Values.conf.policy | indent 4 }} - {{- end }} -diff --git a/senlin/templates/cron-job-engine-cleaner.yaml b/senlin/templates/cron-job-engine-cleaner.yaml -index 18883e4..ce0dd3b 100644 ---- a/senlin/templates/cron-job-engine-cleaner.yaml -+++ b/senlin/templates/cron-job-engine-cleaner.yaml -@@ -76,8 +76,8 @@ spec: - - name: etcsenlin - emptyDir: {} - - name: senlin-etc -- secret: -- secretName: senlin-etc -+ configMap: -+ name: senlin-etc - defaultMode: 0444 - - name: senlin-bin - configMap: -diff --git a/senlin/templates/deployment-api.yaml b/senlin/templates/deployment-api.yaml -index 93eb9b8..0eca3d3 100644 ---- a/senlin/templates/deployment-api.yaml -+++ b/senlin/templates/deployment-api.yaml -@@ -114,8 +114,8 @@ spec: - name: senlin-bin - defaultMode: 0555 - - name: senlin-etc -- secret: -- secretName: senlin-etc -+ configMap: -+ name: senlin-etc - defaultMode: 0444 - {{ if $mounts_senlin_api.volumes }}{{ toYaml $mounts_senlin_api.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/senlin/templates/deployment-engine.yaml b/senlin/templates/deployment-engine.yaml -index fd54515..5c0714b 100644 ---- a/senlin/templates/deployment-engine.yaml -+++ b/senlin/templates/deployment-engine.yaml -@@ -87,8 +87,8 @@ spec: - name: senlin-bin - defaultMode: 0555 - - name: senlin-etc -- secret: -- secretName: senlin-etc -+ configMap: -+ name: senlin-etc - defaultMode: 0444 - {{ if $mounts_senlin_engine.volumes }}{{ toYaml $mounts_senlin_engine.volumes | indent 8 }}{{ end }} - {{- end }} -diff --git a/tempest/templates/configmap-etc.yaml b/tempest/templates/configmap-etc.yaml -index 855c460..bd44108 100644 ---- a/tempest/templates/configmap-etc.yaml -+++ b/tempest/templates/configmap-etc.yaml -@@ -43,16 +43,18 @@ limitations under the License. - - --- - apiVersion: v1 --kind: Secret -+kind: ConfigMap - metadata: - name: tempest-etc --type: Opaque - data: -- tempest.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest | b64enc }} -+ tempest.conf: |+ -+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.tempest | indent 4 }} - {{ if not (empty .Values.conf.blacklist) }} -- test-blacklist: {{ include "tempest.utils.to_regex_file" .Values.conf.blacklist | b64enc }} -+ test-blacklist: |+ -+{{ include "tempest.utils.to_regex_file" .Values.conf.blacklist | indent 4 }} - {{ end }} - {{ if not (empty .Values.conf.whitelist) }} -- test-whitelist: {{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | b64enc }} -+ test-whitelist: |+ -+{{ include "tempest.utils.to_regex_file" .Values.conf.whitelist | indent 4 }} - {{ end }} - {{- end }} -diff --git a/tempest/templates/job-run-tests.yaml b/tempest/templates/job-run-tests.yaml -index 6f29e1a..1865aa5 100644 ---- a/tempest/templates/job-run-tests.yaml -+++ b/tempest/templates/job-run-tests.yaml -@@ -91,8 +91,8 @@ spec: - - name: etctempest - emptyDir: {} - - name: tempest-etc -- secret: -- secretName: tempest-etc -+ configMap: -+ name: tempest-etc - defaultMode: 0444 - - name: tempest-bin - configMap: --- -1.8.3.1 - diff --git a/openstack/openstack-helm/files/0005-Add-Panko-Chart.patch b/openstack/openstack-helm/files/0003-Add-Panko-Chart.patch similarity index 98% rename from openstack/openstack-helm/files/0005-Add-Panko-Chart.patch rename to openstack/openstack-helm/files/0003-Add-Panko-Chart.patch index 47344949..b71bb1b5 100644 --- a/openstack/openstack-helm/files/0005-Add-Panko-Chart.patch +++ b/openstack/openstack-helm/files/0003-Add-Panko-Chart.patch @@ -1,7 +1,7 @@ -From 37fd9663c087532e35d3e514d91b29994022abfa Mon Sep 17 00:00:00 2001 +From e52f311273dd9674cde764cf8f1c3bc02e8d0e00 Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Wed, 14 Nov 2018 11:58:17 -0500 -Subject: [PATCH 1/1] Add Panko Chart +Subject: [PATCH 3/3] Add Panko Chart This commit adds a helm chart to deploy Panko. @@ -66,7 +66,7 @@ https://review.openstack.org/#/c/469180/ diff --git a/panko/Chart.yaml b/panko/Chart.yaml new file mode 100755 -index 0000000..7c5842a +index 00000000..7c5842ac --- /dev/null +++ b/panko/Chart.yaml @@ -0,0 +1,24 @@ @@ -96,7 +96,7 @@ index 0000000..7c5842a + - name: OpenStack-Helm Authors diff --git a/panko/requirements.yaml b/panko/requirements.yaml new file mode 100755 -index 0000000..53782e6 +index 00000000..53782e69 --- /dev/null +++ b/panko/requirements.yaml @@ -0,0 +1,18 @@ @@ -120,7 +120,7 @@ index 0000000..53782e6 + version: 0.1.0 diff --git a/panko/templates/bin/_bootstrap.sh.tpl b/panko/templates/bin/_bootstrap.sh.tpl new file mode 100755 -index 0000000..81a93b4 +index 00000000..81a93b42 --- /dev/null +++ b/panko/templates/bin/_bootstrap.sh.tpl @@ -0,0 +1,20 @@ @@ -147,7 +147,7 @@ index 0000000..81a93b4 \ No newline at end of file diff --git a/panko/templates/bin/_db-sync.sh.tpl b/panko/templates/bin/_db-sync.sh.tpl new file mode 100755 -index 0000000..8ca583a +index 00000000..8ca583a9 --- /dev/null +++ b/panko/templates/bin/_db-sync.sh.tpl @@ -0,0 +1,21 @@ @@ -174,7 +174,7 @@ index 0000000..8ca583a +exec panko-dbsync diff --git a/panko/templates/bin/_panko-api.sh.tpl b/panko/templates/bin/_panko-api.sh.tpl new file mode 100755 -index 0000000..bd08a43 +index 00000000..bd08a438 --- /dev/null +++ b/panko/templates/bin/_panko-api.sh.tpl @@ -0,0 +1,40 @@ @@ -220,7 +220,7 @@ index 0000000..bd08a43 + diff --git a/panko/templates/bin/_panko-events-cleaner.sh.tpl b/panko/templates/bin/_panko-events-cleaner.sh.tpl new file mode 100755 -index 0000000..10f3a86 +index 00000000..10f3a863 --- /dev/null +++ b/panko/templates/bin/_panko-events-cleaner.sh.tpl @@ -0,0 +1,21 @@ @@ -247,7 +247,7 @@ index 0000000..10f3a86 +panko-expirer diff --git a/panko/templates/bin/_panko-test.sh.tpl b/panko/templates/bin/_panko-test.sh.tpl new file mode 100755 -index 0000000..28273f9 +index 00000000..28273f9f --- /dev/null +++ b/panko/templates/bin/_panko-test.sh.tpl @@ -0,0 +1,29 @@ @@ -282,7 +282,7 @@ index 0000000..28273f9 +exit 0 diff --git a/panko/templates/configmap-bin.yaml b/panko/templates/configmap-bin.yaml new file mode 100755 -index 0000000..2eb73f4 +index 00000000..2eb73f48 --- /dev/null +++ b/panko/templates/configmap-bin.yaml @@ -0,0 +1,51 @@ @@ -339,7 +339,7 @@ index 0000000..2eb73f4 +{{- end }} diff --git a/panko/templates/configmap-etc.yaml b/panko/templates/configmap-etc.yaml new file mode 100755 -index 0000000..f2d02c8 +index 00000000..f2d02c8c --- /dev/null +++ b/panko/templates/configmap-etc.yaml @@ -0,0 +1,91 @@ @@ -436,7 +436,7 @@ index 0000000..f2d02c8 +{{- end }} diff --git a/panko/templates/cron-job-events-cleaner.yaml b/panko/templates/cron-job-events-cleaner.yaml new file mode 100755 -index 0000000..b0794b5 +index 00000000..b0794b50 --- /dev/null +++ b/panko/templates/cron-job-events-cleaner.yaml @@ -0,0 +1,84 @@ @@ -526,7 +526,7 @@ index 0000000..b0794b5 +{{- end }} diff --git a/panko/templates/deployment-api.yaml b/panko/templates/deployment-api.yaml new file mode 100755 -index 0000000..93c3ada +index 00000000..93c3ada2 --- /dev/null +++ b/panko/templates/deployment-api.yaml @@ -0,0 +1,121 @@ @@ -653,7 +653,7 @@ index 0000000..93c3ada +{{- end }} diff --git a/panko/templates/ingress-api.yaml b/panko/templates/ingress-api.yaml new file mode 100755 -index 0000000..d6d0e88 +index 00000000..d6d0e88a --- /dev/null +++ b/panko/templates/ingress-api.yaml @@ -0,0 +1,20 @@ @@ -679,7 +679,7 @@ index 0000000..d6d0e88 +{{- end }} diff --git a/panko/templates/job-bootstrap.yaml b/panko/templates/job-bootstrap.yaml new file mode 100755 -index 0000000..7321d4b +index 00000000..7321d4ba --- /dev/null +++ b/panko/templates/job-bootstrap.yaml @@ -0,0 +1,20 @@ @@ -705,7 +705,7 @@ index 0000000..7321d4b +{{- end }} diff --git a/panko/templates/job-db-drop.yaml b/panko/templates/job-db-drop.yaml new file mode 100755 -index 0000000..7e50dbe +index 00000000..7e50dbe0 --- /dev/null +++ b/panko/templates/job-db-drop.yaml @@ -0,0 +1,20 @@ @@ -732,7 +732,7 @@ index 0000000..7e50dbe \ No newline at end of file diff --git a/panko/templates/job-db-init.yaml b/panko/templates/job-db-init.yaml new file mode 100755 -index 0000000..22f4ddb +index 00000000..22f4ddb6 --- /dev/null +++ b/panko/templates/job-db-init.yaml @@ -0,0 +1,20 @@ @@ -759,7 +759,7 @@ index 0000000..22f4ddb \ No newline at end of file diff --git a/panko/templates/job-db-sync.yaml b/panko/templates/job-db-sync.yaml new file mode 100755 -index 0000000..4b2fe73 +index 00000000..4b2fe735 --- /dev/null +++ b/panko/templates/job-db-sync.yaml @@ -0,0 +1,20 @@ @@ -786,7 +786,7 @@ index 0000000..4b2fe73 \ No newline at end of file diff --git a/panko/templates/job-image-repo-sync.yaml b/panko/templates/job-image-repo-sync.yaml new file mode 100755 -index 0000000..8faed5b +index 00000000..8faed5ba --- /dev/null +++ b/panko/templates/job-image-repo-sync.yaml @@ -0,0 +1,20 @@ @@ -813,7 +813,7 @@ index 0000000..8faed5b \ No newline at end of file diff --git a/panko/templates/job-ks-endpoints.yaml b/panko/templates/job-ks-endpoints.yaml new file mode 100755 -index 0000000..77457ba +index 00000000..77457ba6 --- /dev/null +++ b/panko/templates/job-ks-endpoints.yaml @@ -0,0 +1,20 @@ @@ -840,7 +840,7 @@ index 0000000..77457ba \ No newline at end of file diff --git a/panko/templates/job-ks-service.yaml b/panko/templates/job-ks-service.yaml new file mode 100755 -index 0000000..1531564 +index 00000000..15315648 --- /dev/null +++ b/panko/templates/job-ks-service.yaml @@ -0,0 +1,20 @@ @@ -867,7 +867,7 @@ index 0000000..1531564 \ No newline at end of file diff --git a/panko/templates/job-ks-user.yaml b/panko/templates/job-ks-user.yaml new file mode 100755 -index 0000000..bff96ed +index 00000000..bff96ed6 --- /dev/null +++ b/panko/templates/job-ks-user.yaml @@ -0,0 +1,20 @@ @@ -894,7 +894,7 @@ index 0000000..bff96ed \ No newline at end of file diff --git a/panko/templates/pdb-api.yaml b/panko/templates/pdb-api.yaml new file mode 100755 -index 0000000..fc6fcd0 +index 00000000..fc6fcd0e --- /dev/null +++ b/panko/templates/pdb-api.yaml @@ -0,0 +1,29 @@ @@ -929,7 +929,7 @@ index 0000000..fc6fcd0 +{{- end }} diff --git a/panko/templates/pod-panko-test.yaml b/panko/templates/pod-panko-test.yaml new file mode 100755 -index 0000000..2acc43a +index 00000000..2acc43a2 --- /dev/null +++ b/panko/templates/pod-panko-test.yaml @@ -0,0 +1,72 @@ @@ -1007,7 +1007,7 @@ index 0000000..2acc43a +{{- end }} diff --git a/panko/templates/secret-db.yaml b/panko/templates/secret-db.yaml new file mode 100755 -index 0000000..58edac4 +index 00000000..58edac4c --- /dev/null +++ b/panko/templates/secret-db.yaml @@ -0,0 +1,30 @@ @@ -1044,7 +1044,7 @@ index 0000000..58edac4 \ No newline at end of file diff --git a/panko/templates/secret-keystone.yaml b/panko/templates/secret-keystone.yaml new file mode 100755 -index 0000000..9b44ceb +index 00000000..9b44ceb2 --- /dev/null +++ b/panko/templates/secret-keystone.yaml @@ -0,0 +1,30 @@ @@ -1080,7 +1080,7 @@ index 0000000..9b44ceb +{{- end }} diff --git a/panko/templates/service-api.yaml b/panko/templates/service-api.yaml new file mode 100755 -index 0000000..893d9e3 +index 00000000..893d9e3d --- /dev/null +++ b/panko/templates/service-api.yaml @@ -0,0 +1,39 @@ @@ -1125,7 +1125,7 @@ index 0000000..893d9e3 +{{- end }} diff --git a/panko/templates/service-ingress-api.yaml b/panko/templates/service-ingress-api.yaml new file mode 100755 -index 0000000..422e74d +index 00000000..422e74dd --- /dev/null +++ b/panko/templates/service-ingress-api.yaml @@ -0,0 +1,20 @@ @@ -1152,7 +1152,7 @@ index 0000000..422e74d \ No newline at end of file diff --git a/panko/values.yaml b/panko/values.yaml new file mode 100755 -index 0000000..a206a31 +index 00000000..a206a31b --- /dev/null +++ b/panko/values.yaml @@ -0,0 +1,535 @@ @@ -1692,5 +1692,5 @@ index 0000000..a206a31 + service_ingress_api: true + -- -1.8.3.1 +2.16.5