diff --git a/openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch b/openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch
index 960b250f..f52b4f1b 100644
--- a/openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch
+++ b/openstack/openstack-helm/files/0001-ceilometer-chart-updates.patch
@@ -1,7 +1,7 @@
-From 194d712bafb63186850fb451185bdaaaa8054c23 Mon Sep 17 00:00:00 2001
+From f4d666c7fd832307dccb7f0096a48c917179449d Mon Sep 17 00:00:00 2001
 From: Angie Wang <angie.wang@windriver.com>
 Date: Fri, 19 Oct 2018 14:46:27 -0400
-Subject: [PATCH 1/3] ceilometer chart updates
+Subject: [PATCH 1/1] ceilometer chart updates
 
 This commit includes the following changes:
 - add polling process with ipmi function
@@ -13,8 +13,6 @@ This commit includes the following changes:
 - add the ability to push events to panko
 
 We should try to upstream above changes.
-
-We need to rework a bit once the commit "Openstack: Use k8s secret to store config" is put back.
 ---
  ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl  |   13 +
  ceilometer/templates/bin/_db-sync.sh.tpl          |    2 +-
@@ -31,7 +29,7 @@ We need to rework a bit once the commit "Openstack: Use k8s secret to store conf
 
 diff --git a/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl b/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl
 new file mode 100644
-index 00000000..ad280c30
+index 0000000..ad280c3
 --- /dev/null
 +++ b/ceilometer/templates/bin/_ceilometer-ipmi.sh.tpl
 @@ -0,0 +1,13 @@
@@ -49,7 +47,7 @@ index 00000000..ad280c30
 +  --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 02f6f5d4..ba7c1d84 100644
+index 02f6f5d..ba7c1d8 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 +57,7 @@ index 02f6f5d4..ba7c1d84 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 6c7d59a9..558f24e7 100644
+index 6c7d59a..558f24e 100644
 --- a/ceilometer/templates/configmap-bin.yaml
 +++ b/ceilometer/templates/configmap-bin.yaml
 @@ -53,6 +53,8 @@ data:
@@ -72,7 +70,7 @@ index 6c7d59a9..558f24e7 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 17ddb1b0..c48a3b8b 100644
+index 17ddb1b..c48a3b8 100644
 --- a/ceilometer/templates/configmap-etc.yaml
 +++ b/ceilometer/templates/configmap-etc.yaml
 @@ -32,6 +32,10 @@ limitations under the License.
@@ -95,7 +93,7 @@ index 17ddb1b0..c48a3b8b 100644
  {{ 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 686572af..bff2e15a 100644
+index 686572a..bff2e15 100644
 --- a/ceilometer/templates/daemonset-compute.yaml
 +++ b/ceilometer/templates/daemonset-compute.yaml
 @@ -91,6 +91,10 @@ spec:
@@ -111,7 +109,7 @@ index 686572af..bff2e15a 100644
                subPath: ceilometer-compute.sh
 diff --git a/ceilometer/templates/daemonset-ipmi.yaml b/ceilometer/templates/daemonset-ipmi.yaml
 new file mode 100644
-index 00000000..9a7d72bf
+index 0000000..3119ace
 --- /dev/null
 +++ b/ceilometer/templates/daemonset-ipmi.yaml
 @@ -0,0 +1,105 @@
@@ -211,8 +209,8 @@ index 00000000..9a7d72bf
 +        - name: pod-etc-ceilometer
 +          emptyDir: {}
 +        - name: ceilometer-etc
-+          configMap:
-+            name: ceilometer-etc
++          secret:
++            secretName: ceilometer-etc
 +            defaultMode: 0444
 +        - name: ceilometer-bin
 +          configMap:
@@ -221,7 +219,7 @@ index 00000000..9a7d72bf
 +{{ 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 b7a597bf..7a6cd2b6 100644
+index b7a597b..7a6cd2b 100644
 --- a/ceilometer/templates/deployment-central.yaml
 +++ b/ceilometer/templates/deployment-central.yaml
 @@ -89,6 +89,10 @@ spec:
@@ -236,7 +234,7 @@ index b7a597bf..7a6cd2b6 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 06fda3df..cb528ca9 100644
+index 06fda3d..45d7ecb 100644
 --- a/ceilometer/templates/deployment-notification.yaml
 +++ b/ceilometer/templates/deployment-notification.yaml
 @@ -89,14 +89,30 @@ spec:
@@ -275,13 +273,13 @@ index 06fda3df..cb528ca9 100644
              name: ceilometer-bin
              defaultMode: 0555
 +        - name: panko-etc
-+          configMap:
-+            name: panko-etc
++          secret:
++            secretName: panko-etc
 +            defaultMode: 0444
  {{ 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 50219679..5908a4ec 100644
+index 5021967..5908a4e 100644
 --- a/ceilometer/values.yaml
 +++ b/ceilometer/values.yaml
 @@ -29,6 +29,9 @@ labels:
@@ -2108,5 +2106,5 @@ index 50219679..5908a4ec 100644
    ingress_api: true
    job_bootstrap: true
 -- 
-2.16.5
+1.8.3.1
 
diff --git a/openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch b/openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch
index 7db68f07..c8b3659e 100644
--- a/openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch
+++ b/openstack/openstack-helm/files/0002-Add-Aodh-Chart.patch
@@ -1,7 +1,7 @@
-From 8615d16af10e1d14dedeb9a026e59491142c0dbf Mon Sep 17 00:00:00 2001
+From 656e36a319f48424d61624473b41c95aa610cd04 Mon Sep 17 00:00:00 2001
 From: Angie Wang <angie.wang@windriver.com>
 Date: Wed, 14 Nov 2018 11:39:55 -0500
-Subject: [PATCH 2/3] Add Aodh Chart
+Subject: [PATCH 1/2] Add Aodh Chart
 
 This commit adds a helm chart to deloy Aodh.
 
@@ -19,7 +19,7 @@ https://review.openstack.org/#/c/468530/
  aodh/templates/bin/_bootstrap.sh.tpl           |  20 +
  aodh/templates/bin/_db-sync.sh.tpl             |  21 +
  aodh/templates/configmap-bin.yaml              |  60 +++
- aodh/templates/configmap-etc.yaml              | 123 +++++
+ aodh/templates/configmap-etc.yaml              | 121 +++++
  aodh/templates/cron-job-alarms-cleaner.yaml    |  84 ++++
  aodh/templates/deployment-api.yaml             | 121 +++++
  aodh/templates/deployment-evaluator.yaml       | 101 ++++
@@ -43,7 +43,7 @@ https://review.openstack.org/#/c/468530/
  aodh/templates/service-api.yaml                |  39 ++
  aodh/templates/service-ingress-api.yaml        |  20 +
  aodh/values.yaml                               | 671 +++++++++++++++++++++++++
- 35 files changed, 2075 insertions(+)
+ 35 files changed, 2073 insertions(+)
  create mode 100644 aodh/Chart.yaml
  create mode 100644 aodh/requirements.yaml
  create mode 100644 aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl
@@ -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 00000000..6f666f0e
+index 0000000..6f666f0
 --- /dev/null
 +++ b/aodh/Chart.yaml
 @@ -0,0 +1,24 @@
@@ -112,7 +112,7 @@ index 00000000..6f666f0e
 +  - name: OpenStack-Helm Authors
 diff --git a/aodh/requirements.yaml b/aodh/requirements.yaml
 new file mode 100644
-index 00000000..53782e69
+index 0000000..53782e6
 --- /dev/null
 +++ b/aodh/requirements.yaml
 @@ -0,0 +1,18 @@
@@ -136,7 +136,7 @@ index 00000000..53782e69
 +    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 00000000..8ca0e7c5
+index 0000000..8ca0e7c
 --- /dev/null
 +++ b/aodh/templates/bin/_aodh-alarms-cleaner.sh.tpl
 @@ -0,0 +1,21 @@
@@ -163,7 +163,7 @@ index 00000000..8ca0e7c5
 +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 00000000..708b3272
+index 0000000..708b327
 --- /dev/null
 +++ b/aodh/templates/bin/_aodh-api.sh.tpl
 @@ -0,0 +1,39 @@
@@ -208,7 +208,7 @@ index 00000000..708b3272
 +$COMMAND
 diff --git a/aodh/templates/bin/_aodh-evaluator.sh.tpl b/aodh/templates/bin/_aodh-evaluator.sh.tpl
 new file mode 100644
-index 00000000..7c7b07b0
+index 0000000..7c7b07b
 --- /dev/null
 +++ b/aodh/templates/bin/_aodh-evaluator.sh.tpl
 @@ -0,0 +1,21 @@
@@ -235,7 +235,7 @@ index 00000000..7c7b07b0
 +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 00000000..0abeba43
+index 0000000..0abeba4
 --- /dev/null
 +++ b/aodh/templates/bin/_aodh-listener.sh.tpl
 @@ -0,0 +1,21 @@
@@ -262,7 +262,7 @@ index 00000000..0abeba43
 +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 00000000..b1b4f947
+index 0000000..b1b4f94
 --- /dev/null
 +++ b/aodh/templates/bin/_aodh-notifier.sh.tpl
 @@ -0,0 +1,21 @@
@@ -289,7 +289,7 @@ index 00000000..b1b4f947
 +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 00000000..fc95b06c
+index 0000000..fc95b06
 --- /dev/null
 +++ b/aodh/templates/bin/_aodh-test.sh.tpl
 @@ -0,0 +1,54 @@
@@ -349,7 +349,7 @@ index 00000000..fc95b06c
 +
 diff --git a/aodh/templates/bin/_bootstrap.sh.tpl b/aodh/templates/bin/_bootstrap.sh.tpl
 new file mode 100644
-index 00000000..533c0a5a
+index 0000000..533c0a5
 --- /dev/null
 +++ b/aodh/templates/bin/_bootstrap.sh.tpl
 @@ -0,0 +1,20 @@
@@ -375,7 +375,7 @@ index 00000000..533c0a5a
 +{{ .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 00000000..7eb7bd3f
+index 0000000..7eb7bd3
 --- /dev/null
 +++ b/aodh/templates/bin/_db-sync.sh.tpl
 @@ -0,0 +1,21 @@
@@ -402,7 +402,7 @@ index 00000000..7eb7bd3f
 +aodh-dbsync
 diff --git a/aodh/templates/configmap-bin.yaml b/aodh/templates/configmap-bin.yaml
 new file mode 100644
-index 00000000..3ee32e79
+index 0000000..3ee32e7
 --- /dev/null
 +++ b/aodh/templates/configmap-bin.yaml
 @@ -0,0 +1,60 @@
@@ -468,10 +468,10 @@ index 00000000..3ee32e79
 +{{- end }}
 diff --git a/aodh/templates/configmap-etc.yaml b/aodh/templates/configmap-etc.yaml
 new file mode 100644
-index 00000000..81f4e1fb
+index 0000000..24e4e08
 --- /dev/null
 +++ b/aodh/templates/configmap-etc.yaml
-@@ -0,0 +1,123 @@
+@@ -0,0 +1,121 @@
 +{{/*
 +Copyright 2017 The Openstack-Helm Authors.
 +
@@ -581,24 +581,21 @@ index 00000000..81f4e1fb
 +{{- end -}}
 +---
 +apiVersion: v1
-+kind: ConfigMap
++kind: Secret
 +metadata:
 +  name: aodh-etc
++type: Opaque
 +data:
-+  aodh.conf: |
-+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.aodh | 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 }}
-+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_aodh "key" "wsgi-aodh.conf" ) | indent 2 }}
++  aodh.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.aodh | 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 }}
++{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_aodh "key" "wsgi-aodh.conf" "format" "Secret" ) | indent 2 }}
 +{{- end }}
-\ 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 00000000..6862c5f3
+index 0000000..efb839b
 --- /dev/null
 +++ b/aodh/templates/cron-job-alarms-cleaner.yaml
 @@ -0,0 +1,84 @@
@@ -677,8 +674,8 @@ index 00000000..6862c5f3
 +          - name: pod-etc-aodh
 +            emptyDir: {}
 +          - name: aodh-etc
-+            configMap:
-+              name: aodh-etc
++            secret:
++              secretName: aodh-etc
 +              defaultMode: 0444
 +          - name: aodh-bin
 +            configMap:
@@ -688,7 +685,7 @@ index 00000000..6862c5f3
 +{{- end }}
 diff --git a/aodh/templates/deployment-api.yaml b/aodh/templates/deployment-api.yaml
 new file mode 100644
-index 00000000..61902610
+index 0000000..cfe697b
 --- /dev/null
 +++ b/aodh/templates/deployment-api.yaml
 @@ -0,0 +1,121 @@
@@ -804,8 +801,8 @@ index 00000000..61902610
 +        - name: pod-etc-aodh
 +          emptyDir: {}
 +        - name: aodh-etc
-+          configMap:
-+            name: aodh-etc
++          secret:
++            secretName: aodh-etc
 +            defaultMode: 0444
 +        - name: aodh-bin
 +          configMap:
@@ -813,10 +810,9 @@ index 00000000..61902610
 +            defaultMode: 0555
 +{{ if $mounts_aodh_api.volumes }}{{ toYaml $mounts_aodh_api.volumes | indent 8 }}{{ end }}
 +{{- end }}
-\ 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 00000000..175f1421
+index 0000000..daab9c1
 --- /dev/null
 +++ b/aodh/templates/deployment-evaluator.yaml
 @@ -0,0 +1,101 @@
@@ -912,8 +908,8 @@ index 00000000..175f1421
 +        - name: pod-etc-aodh
 +          emptyDir: {}
 +        - name: aodh-etc
-+          configMap:
-+            name: aodh-etc
++          secret:
++            secretName: aodh-etc
 +            defaultMode: 0444
 +        - name: aodh-bin
 +          configMap:
@@ -923,7 +919,7 @@ index 00000000..175f1421
 +{{- end }}
 diff --git a/aodh/templates/deployment-listener.yaml b/aodh/templates/deployment-listener.yaml
 new file mode 100644
-index 00000000..ca1dc191
+index 0000000..5f90c75
 --- /dev/null
 +++ b/aodh/templates/deployment-listener.yaml
 @@ -0,0 +1,102 @@
@@ -1019,8 +1015,8 @@ index 00000000..ca1dc191
 +        - name: pod-etc-aodh
 +          emptyDir: {}
 +        - name: aodh-etc
-+          configMap:
-+            name: aodh-etc
++          secret:
++            secretName: aodh-etc
 +            defaultMode: 0444
 +        - name: aodh-bin
 +          configMap:
@@ -1031,7 +1027,7 @@ index 00000000..ca1dc191
 +
 diff --git a/aodh/templates/deployment-notifier.yaml b/aodh/templates/deployment-notifier.yaml
 new file mode 100644
-index 00000000..068d83a9
+index 0000000..ee21422
 --- /dev/null
 +++ b/aodh/templates/deployment-notifier.yaml
 @@ -0,0 +1,103 @@
@@ -1128,8 +1124,8 @@ index 00000000..068d83a9
 +        - name: pod-etc-aodh
 +          emptyDir: {}
 +        - name: aodh-etc
-+          configMap:
-+            name: aodh-etc
++          secret:
++            secretName: aodh-etc
 +            defaultMode: 0444
 +        - name: aodh-bin
 +          configMap:
@@ -1140,7 +1136,7 @@ index 00000000..068d83a9
 +
 diff --git a/aodh/templates/ingress-api.yaml b/aodh/templates/ingress-api.yaml
 new file mode 100644
-index 00000000..fe3f31c4
+index 0000000..fe3f31c
 --- /dev/null
 +++ b/aodh/templates/ingress-api.yaml
 @@ -0,0 +1,20 @@
@@ -1166,7 +1162,7 @@ index 00000000..fe3f31c4
 +{{- end }}
 diff --git a/aodh/templates/job-bootstrap.yaml b/aodh/templates/job-bootstrap.yaml
 new file mode 100644
-index 00000000..17cea12b
+index 0000000..17cea12
 --- /dev/null
 +++ b/aodh/templates/job-bootstrap.yaml
 @@ -0,0 +1,20 @@
@@ -1192,7 +1188,7 @@ index 00000000..17cea12b
 +{{- end }}
 diff --git a/aodh/templates/job-db-drop.yaml b/aodh/templates/job-db-drop.yaml
 new file mode 100644
-index 00000000..8c2d80c3
+index 0000000..8c2d80c
 --- /dev/null
 +++ b/aodh/templates/job-db-drop.yaml
 @@ -0,0 +1,20 @@
@@ -1219,7 +1215,7 @@ index 00000000..8c2d80c3
 \ 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 00000000..5d14fb75
+index 0000000..5d14fb7
 --- /dev/null
 +++ b/aodh/templates/job-db-init.yaml
 @@ -0,0 +1,20 @@
@@ -1245,7 +1241,7 @@ index 00000000..5d14fb75
 +{{- end }}
 diff --git a/aodh/templates/job-db-sync.yaml b/aodh/templates/job-db-sync.yaml
 new file mode 100644
-index 00000000..2428c7f2
+index 0000000..2428c7f
 --- /dev/null
 +++ b/aodh/templates/job-db-sync.yaml
 @@ -0,0 +1,20 @@
@@ -1271,7 +1267,7 @@ index 00000000..2428c7f2
 +{{- end }}
 diff --git a/aodh/templates/job-image-repo-sync.yaml b/aodh/templates/job-image-repo-sync.yaml
 new file mode 100644
-index 00000000..0eeef1ed
+index 0000000..0eeef1e
 --- /dev/null
 +++ b/aodh/templates/job-image-repo-sync.yaml
 @@ -0,0 +1,20 @@
@@ -1297,7 +1293,7 @@ index 00000000..0eeef1ed
 +{{- end }}
 diff --git a/aodh/templates/job-ks-endpoints.yaml b/aodh/templates/job-ks-endpoints.yaml
 new file mode 100644
-index 00000000..7fc30c2b
+index 0000000..7fc30c2
 --- /dev/null
 +++ b/aodh/templates/job-ks-endpoints.yaml
 @@ -0,0 +1,20 @@
@@ -1323,7 +1319,7 @@ index 00000000..7fc30c2b
 +{{- end }}
 diff --git a/aodh/templates/job-ks-service.yaml b/aodh/templates/job-ks-service.yaml
 new file mode 100644
-index 00000000..b4120b3c
+index 0000000..b4120b3
 --- /dev/null
 +++ b/aodh/templates/job-ks-service.yaml
 @@ -0,0 +1,20 @@
@@ -1349,7 +1345,7 @@ index 00000000..b4120b3c
 +{{- end }}
 diff --git a/aodh/templates/job-ks-user.yaml b/aodh/templates/job-ks-user.yaml
 new file mode 100644
-index 00000000..96189310
+index 0000000..9618931
 --- /dev/null
 +++ b/aodh/templates/job-ks-user.yaml
 @@ -0,0 +1,20 @@
@@ -1375,7 +1371,7 @@ index 00000000..96189310
 +{{- end }}
 diff --git a/aodh/templates/job-rabbit-init.yaml b/aodh/templates/job-rabbit-init.yaml
 new file mode 100644
-index 00000000..06cc5a71
+index 0000000..06cc5a7
 --- /dev/null
 +++ b/aodh/templates/job-rabbit-init.yaml
 @@ -0,0 +1,20 @@
@@ -1401,7 +1397,7 @@ index 00000000..06cc5a71
 +{{- end }}
 diff --git a/aodh/templates/pdb-api.yaml b/aodh/templates/pdb-api.yaml
 new file mode 100644
-index 00000000..1892708e
+index 0000000..1892708
 --- /dev/null
 +++ b/aodh/templates/pdb-api.yaml
 @@ -0,0 +1,29 @@
@@ -1436,7 +1432,7 @@ index 00000000..1892708e
 +{{- end }}
 diff --git a/aodh/templates/pod-aodh-test.yaml b/aodh/templates/pod-aodh-test.yaml
 new file mode 100644
-index 00000000..9254c922
+index 0000000..a12ec30
 --- /dev/null
 +++ b/aodh/templates/pod-aodh-test.yaml
 @@ -0,0 +1,72 @@
@@ -1503,8 +1499,8 @@ index 00000000..9254c922
 +{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
 +  volumes:
 +    - name: aodh-etc
-+      configMap:
-+        name: aodh-etc
++      secret:
++        secretName: aodh-etc
 +        defaultMode: 0444
 +    - name: aodh-bin
 +      configMap:
@@ -1514,7 +1510,7 @@ index 00000000..9254c922
 +{{- end }}
 diff --git a/aodh/templates/secret-db.yaml b/aodh/templates/secret-db.yaml
 new file mode 100644
-index 00000000..85568c1a
+index 0000000..85568c1
 --- /dev/null
 +++ b/aodh/templates/secret-db.yaml
 @@ -0,0 +1,30 @@
@@ -1551,7 +1547,7 @@ index 00000000..85568c1a
 \ 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 00000000..aef25b2e
+index 0000000..aef25b2
 --- /dev/null
 +++ b/aodh/templates/secret-keystone.yaml
 @@ -0,0 +1,30 @@
@@ -1587,7 +1583,7 @@ index 00000000..aef25b2e
 +{{- end }}
 diff --git a/aodh/templates/secret-rabbitmq.yaml b/aodh/templates/secret-rabbitmq.yaml
 new file mode 100644
-index 00000000..ad65ae34
+index 0000000..ad65ae3
 --- /dev/null
 +++ b/aodh/templates/secret-rabbitmq.yaml
 @@ -0,0 +1,30 @@
@@ -1623,7 +1619,7 @@ index 00000000..ad65ae34
 +{{- end }}
 diff --git a/aodh/templates/service-api.yaml b/aodh/templates/service-api.yaml
 new file mode 100644
-index 00000000..bb9083ef
+index 0000000..bb9083e
 --- /dev/null
 +++ b/aodh/templates/service-api.yaml
 @@ -0,0 +1,39 @@
@@ -1668,7 +1664,7 @@ index 00000000..bb9083ef
 +{{- end }}
 diff --git a/aodh/templates/service-ingress-api.yaml b/aodh/templates/service-ingress-api.yaml
 new file mode 100644
-index 00000000..c1b96584
+index 0000000..c1b9658
 --- /dev/null
 +++ b/aodh/templates/service-ingress-api.yaml
 @@ -0,0 +1,20 @@
@@ -1694,7 +1690,7 @@ index 00000000..c1b96584
 +{{- end }}
 diff --git a/aodh/values.yaml b/aodh/values.yaml
 new file mode 100644
-index 00000000..bd7a736f
+index 0000000..bd7a736
 --- /dev/null
 +++ b/aodh/values.yaml
 @@ -0,0 +1,671 @@
@@ -2370,5 +2366,5 @@ index 00000000..bd7a736f
 +  service_ingress_api: true
 +
 -- 
-2.16.5
+1.8.3.1
 
diff --git a/openstack/openstack-helm/files/0003-Add-Panko-Chart.patch b/openstack/openstack-helm/files/0003-Add-Panko-Chart.patch
index b71bb1b5..c789dc80 100644
--- a/openstack/openstack-helm/files/0003-Add-Panko-Chart.patch
+++ b/openstack/openstack-helm/files/0003-Add-Panko-Chart.patch
@@ -1,7 +1,7 @@
-From e52f311273dd9674cde764cf8f1c3bc02e8d0e00 Mon Sep 17 00:00:00 2001
+From 8b9997083fed316cc5be1316868c2e58a9ba5197 Mon Sep 17 00:00:00 2001
 From: Angie Wang <angie.wang@windriver.com>
 Date: Wed, 14 Nov 2018 11:58:17 -0500
-Subject: [PATCH 3/3] Add Panko Chart
+Subject: [PATCH 1/1] Add Panko Chart
 
 This commit adds a helm chart to deploy Panko.
 
@@ -16,7 +16,7 @@ https://review.openstack.org/#/c/469180/
  panko/templates/bin/_panko-events-cleaner.sh.tpl |  21 +
  panko/templates/bin/_panko-test.sh.tpl           |  29 ++
  panko/templates/configmap-bin.yaml               |  51 +++
- panko/templates/configmap-etc.yaml               |  91 ++++
+ panko/templates/configmap-etc.yaml               |  88 ++++
  panko/templates/cron-job-events-cleaner.yaml     |  84 ++++
  panko/templates/deployment-api.yaml              | 121 +++++
  panko/templates/ingress-api.yaml                 |  20 +
@@ -35,7 +35,7 @@ https://review.openstack.org/#/c/469180/
  panko/templates/service-api.yaml                 |  39 ++
  panko/templates/service-ingress-api.yaml         |  20 +
  panko/values.yaml                                | 535 +++++++++++++++++++++++
- 27 files changed, 1455 insertions(+)
+ 27 files changed, 1452 insertions(+)
  create mode 100755 panko/Chart.yaml
  create mode 100755 panko/requirements.yaml
  create mode 100755 panko/templates/bin/_bootstrap.sh.tpl
@@ -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 00000000..7c5842ac
+index 0000000..7c5842a
 --- /dev/null
 +++ b/panko/Chart.yaml
 @@ -0,0 +1,24 @@
@@ -96,7 +96,7 @@ index 00000000..7c5842ac
 +  - name: OpenStack-Helm Authors
 diff --git a/panko/requirements.yaml b/panko/requirements.yaml
 new file mode 100755
-index 00000000..53782e69
+index 0000000..53782e6
 --- /dev/null
 +++ b/panko/requirements.yaml
 @@ -0,0 +1,18 @@
@@ -120,7 +120,7 @@ index 00000000..53782e69
 +    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 00000000..81a93b42
+index 0000000..81a93b4
 --- /dev/null
 +++ b/panko/templates/bin/_bootstrap.sh.tpl
 @@ -0,0 +1,20 @@
@@ -147,7 +147,7 @@ index 00000000..81a93b42
 \ 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 00000000..8ca583a9
+index 0000000..8ca583a
 --- /dev/null
 +++ b/panko/templates/bin/_db-sync.sh.tpl
 @@ -0,0 +1,21 @@
@@ -174,7 +174,7 @@ index 00000000..8ca583a9
 +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 00000000..bd08a438
+index 0000000..bd08a43
 --- /dev/null
 +++ b/panko/templates/bin/_panko-api.sh.tpl
 @@ -0,0 +1,40 @@
@@ -220,7 +220,7 @@ index 00000000..bd08a438
 +
 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 00000000..10f3a863
+index 0000000..10f3a86
 --- /dev/null
 +++ b/panko/templates/bin/_panko-events-cleaner.sh.tpl
 @@ -0,0 +1,21 @@
@@ -247,7 +247,7 @@ index 00000000..10f3a863
 +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 00000000..28273f9f
+index 0000000..28273f9
 --- /dev/null
 +++ b/panko/templates/bin/_panko-test.sh.tpl
 @@ -0,0 +1,29 @@
@@ -282,7 +282,7 @@ index 00000000..28273f9f
 +exit 0
 diff --git a/panko/templates/configmap-bin.yaml b/panko/templates/configmap-bin.yaml
 new file mode 100755
-index 00000000..2eb73f48
+index 0000000..2eb73f4
 --- /dev/null
 +++ b/panko/templates/configmap-bin.yaml
 @@ -0,0 +1,51 @@
@@ -339,10 +339,10 @@ index 00000000..2eb73f48
 +{{- end }}
 diff --git a/panko/templates/configmap-etc.yaml b/panko/templates/configmap-etc.yaml
 new file mode 100755
-index 00000000..f2d02c8c
+index 0000000..ed49927
 --- /dev/null
 +++ b/panko/templates/configmap-etc.yaml
-@@ -0,0 +1,91 @@
+@@ -0,0 +1,88 @@
 +{{/*
 +Copyright 2017 The Openstack-Helm Authors.
 +
@@ -420,23 +420,20 @@ index 00000000..f2d02c8c
 +{{- end -}}
 +---
 +apiVersion: v1
-+kind: ConfigMap
++kind: Secret
 +metadata:
 +  name: panko-etc
++type: Opaque
 +data:
-+  panko.conf: |
-+{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.panko | 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 }}
-+{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_panko "key" "wsgi-panko.conf" ) | indent 2 }}
++  panko.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.panko | 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 }}
++{{ include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" .Values.conf.wsgi_panko "key" "wsgi-panko.conf" "format" "Secret" ) | indent 2 }}
 +{{- end }}
 diff --git a/panko/templates/cron-job-events-cleaner.yaml b/panko/templates/cron-job-events-cleaner.yaml
 new file mode 100755
-index 00000000..b0794b50
+index 0000000..941404c
 --- /dev/null
 +++ b/panko/templates/cron-job-events-cleaner.yaml
 @@ -0,0 +1,84 @@
@@ -515,8 +512,8 @@ index 00000000..b0794b50
 +          - name: etcpanko
 +            emptyDir: {}
 +          - name: panko-etc
-+            configMap:
-+              name: panko-etc
++            secret:
++              secretName: panko-etc
 +              defaultMode: 0444
 +          - name: panko-bin
 +            configMap:
@@ -526,7 +523,7 @@ index 00000000..b0794b50
 +{{- end }}
 diff --git a/panko/templates/deployment-api.yaml b/panko/templates/deployment-api.yaml
 new file mode 100755
-index 00000000..93c3ada2
+index 0000000..8f40424
 --- /dev/null
 +++ b/panko/templates/deployment-api.yaml
 @@ -0,0 +1,121 @@
@@ -642,8 +639,8 @@ index 00000000..93c3ada2
 +        - name: etcpanko
 +          emptyDir: {}
 +        - name: panko-etc
-+          configMap:
-+            name: panko-etc
++          secret:
++            secretName: panko-etc
 +            defaultMode: 0444
 +        - name: panko-bin
 +          configMap:
@@ -653,7 +650,7 @@ index 00000000..93c3ada2
 +{{- end }}
 diff --git a/panko/templates/ingress-api.yaml b/panko/templates/ingress-api.yaml
 new file mode 100755
-index 00000000..d6d0e88a
+index 0000000..d6d0e88
 --- /dev/null
 +++ b/panko/templates/ingress-api.yaml
 @@ -0,0 +1,20 @@
@@ -679,7 +676,7 @@ index 00000000..d6d0e88a
 +{{- end }}
 diff --git a/panko/templates/job-bootstrap.yaml b/panko/templates/job-bootstrap.yaml
 new file mode 100755
-index 00000000..7321d4ba
+index 0000000..7321d4b
 --- /dev/null
 +++ b/panko/templates/job-bootstrap.yaml
 @@ -0,0 +1,20 @@
@@ -705,7 +702,7 @@ index 00000000..7321d4ba
 +{{- end }}
 diff --git a/panko/templates/job-db-drop.yaml b/panko/templates/job-db-drop.yaml
 new file mode 100755
-index 00000000..7e50dbe0
+index 0000000..7e50dbe
 --- /dev/null
 +++ b/panko/templates/job-db-drop.yaml
 @@ -0,0 +1,20 @@
@@ -732,7 +729,7 @@ index 00000000..7e50dbe0
 \ 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 00000000..22f4ddb6
+index 0000000..22f4ddb
 --- /dev/null
 +++ b/panko/templates/job-db-init.yaml
 @@ -0,0 +1,20 @@
@@ -759,7 +756,7 @@ index 00000000..22f4ddb6
 \ 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 00000000..4b2fe735
+index 0000000..4b2fe73
 --- /dev/null
 +++ b/panko/templates/job-db-sync.yaml
 @@ -0,0 +1,20 @@
@@ -786,7 +783,7 @@ index 00000000..4b2fe735
 \ 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 00000000..8faed5ba
+index 0000000..8faed5b
 --- /dev/null
 +++ b/panko/templates/job-image-repo-sync.yaml
 @@ -0,0 +1,20 @@
@@ -813,7 +810,7 @@ index 00000000..8faed5ba
 \ 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 00000000..77457ba6
+index 0000000..77457ba
 --- /dev/null
 +++ b/panko/templates/job-ks-endpoints.yaml
 @@ -0,0 +1,20 @@
@@ -840,7 +837,7 @@ index 00000000..77457ba6
 \ 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 00000000..15315648
+index 0000000..1531564
 --- /dev/null
 +++ b/panko/templates/job-ks-service.yaml
 @@ -0,0 +1,20 @@
@@ -867,7 +864,7 @@ index 00000000..15315648
 \ 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 00000000..bff96ed6
+index 0000000..bff96ed
 --- /dev/null
 +++ b/panko/templates/job-ks-user.yaml
 @@ -0,0 +1,20 @@
@@ -894,7 +891,7 @@ index 00000000..bff96ed6
 \ 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 00000000..fc6fcd0e
+index 0000000..fc6fcd0
 --- /dev/null
 +++ b/panko/templates/pdb-api.yaml
 @@ -0,0 +1,29 @@
@@ -929,7 +926,7 @@ index 00000000..fc6fcd0e
 +{{- end }}
 diff --git a/panko/templates/pod-panko-test.yaml b/panko/templates/pod-panko-test.yaml
 new file mode 100755
-index 00000000..2acc43a2
+index 0000000..cf162bf
 --- /dev/null
 +++ b/panko/templates/pod-panko-test.yaml
 @@ -0,0 +1,72 @@
@@ -996,8 +993,8 @@ index 00000000..2acc43a2
 +{{ if $mounts_tests.volumeMounts }}{{ toYaml $mounts_tests.volumeMounts | indent 8 }}{{ end }}
 +  volumes:
 +    - name: panko-etc
-+      configMap:
-+        name: panko-etc
++      secret:
++        secretName: panko-etc
 +        defaultMode: 0444
 +    - name: panko-bin
 +      configMap:
@@ -1007,7 +1004,7 @@ index 00000000..2acc43a2
 +{{- end }}
 diff --git a/panko/templates/secret-db.yaml b/panko/templates/secret-db.yaml
 new file mode 100755
-index 00000000..58edac4c
+index 0000000..58edac4
 --- /dev/null
 +++ b/panko/templates/secret-db.yaml
 @@ -0,0 +1,30 @@
@@ -1044,7 +1041,7 @@ index 00000000..58edac4c
 \ 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 00000000..9b44ceb2
+index 0000000..9b44ceb
 --- /dev/null
 +++ b/panko/templates/secret-keystone.yaml
 @@ -0,0 +1,30 @@
@@ -1080,7 +1077,7 @@ index 00000000..9b44ceb2
 +{{- end }}
 diff --git a/panko/templates/service-api.yaml b/panko/templates/service-api.yaml
 new file mode 100755
-index 00000000..893d9e3d
+index 0000000..893d9e3
 --- /dev/null
 +++ b/panko/templates/service-api.yaml
 @@ -0,0 +1,39 @@
@@ -1125,7 +1122,7 @@ index 00000000..893d9e3d
 +{{- end }}
 diff --git a/panko/templates/service-ingress-api.yaml b/panko/templates/service-ingress-api.yaml
 new file mode 100755
-index 00000000..422e74dd
+index 0000000..422e74d
 --- /dev/null
 +++ b/panko/templates/service-ingress-api.yaml
 @@ -0,0 +1,20 @@
@@ -1152,7 +1149,7 @@ index 00000000..422e74dd
 \ No newline at end of file
 diff --git a/panko/values.yaml b/panko/values.yaml
 new file mode 100755
-index 00000000..a206a31b
+index 0000000..bae4278
 --- /dev/null
 +++ b/panko/values.yaml
 @@ -0,0 +1,535 @@
@@ -1525,7 +1522,7 @@ index 00000000..a206a31b
 +      # authtoken cache encryption key, if not set it will be populated
 +      # automatically with a random value, but to take advantage of
 +      # this feature all services should be set to use the same key,
-+      # and memcache service.                        
++      # and memcache service.
 +      memcache_secret_key: null
 +    hosts:
 +      default: memcached
@@ -1692,5 +1689,5 @@ index 00000000..a206a31b
 +  service_ingress_api: true
 +
 -- 
-2.16.5
+1.8.3.1