From 2065ccd523915c98b1af5ea4dd4da7f05b9aa1ba Mon Sep 17 00:00:00 2001
From: "Haider, Nafiz (nh532m)" <nafizhaider22@gmail.coM>
Date: Tue, 27 Jul 2021 13:31:33 -0500
Subject: [PATCH] Mount rabbitmq tls cert for nova-novnc communication

Change-Id: I80b2515c2f36d0167ee9ef8049bf6b167a5e399d
---
 nova/Chart.yaml                           | 2 +-
 nova/templates/deployment-novncproxy.yaml | 2 ++
 releasenotes/notes/nova.yaml              | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index ac9e88c0..b9ffc4ca 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.9
+version: 0.2.10
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
index 72e3f60d..68db32ac 100644
--- a/nova/templates/deployment-novncproxy.yaml
+++ b/nova/templates/deployment-novncproxy.yaml
@@ -141,6 +141,7 @@ spec:
               mountPath: /tmp/pod-shared
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.compute_novnc_proxy.novncproxy.internal "path" "/etc/nova/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
+{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal "path" "/etc/rabbitmq/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
 {{ if $mounts_nova_novncproxy.volumeMounts }}{{ toYaml $mounts_nova_novncproxy.volumeMounts | indent 12 }}{{ end }}
       volumes:
         - name: pod-tmp
@@ -159,5 +160,6 @@ spec:
           emptyDir: {}
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.endpoints.oslo_db.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
 {{- dict "enabled" .Values.manifests.certificates "name" .Values.secrets.tls.compute_novnc_proxy.novncproxy.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
+{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
 {{ if $mounts_nova_novncproxy.volumes }}{{ toYaml $mounts_nova_novncproxy.volumes | indent 8 }}{{ end }}
 {{- end }}
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 59ea6673..09c53ced 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -30,4 +30,5 @@ nova:
   - 0.2.7 Add Ussuri release support
   - 0.2.8 Fix the cron archive_deleted_rows bash script for before and max-rows values
   - 0.2.9 Add image clean up to rally test
+  - 0.2.10 Add tls cert mounting to nova-novnc
 ...