Merge "Enable multicloud openstack https endpoints"

diff --git a/kubernetes/aai b/kubernetes/aai
index f636b1c..1c9c9bb 160000 (submodule)
--- a/kubernetes/aai
+++ b/kubernetes/aai
@@ -1 +1 @@
-Subproject commit f636b1cc2bf7d391dc76956e906a6f497ef1b092
+Subproject commit 1c9c9bba658057f6147276fba4f84e7db9117e70

diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
index f6dcae2..edb3a2a 100644 (file)
--- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml
@@ -174,12 +174,12 @@ spec:
         - name:  {{ include "common.fullname" . }}-logs
           emptyDir: {}
       {{- if not .Values.persistence.enabled }}
-        - name:  {{ include "common.fullname" . }}-event-logs-pvc
+        - name:  {{ include "common.fullname" . }}-event-logs
           emptyDir: {}
         - name: {{ include "common.fullname" . }}-data
           emptyDir: {}
       {{- if .Values.global.aafEnabled }}
-        - name:  {{ include "common.fullname" . }}-aaf-props-pvc
+        - name:  {{ include "common.fullname" . }}-aaf-props
           emptyDir: {}
       {{- end }}
       {{- end }}