From 5aa17f74d8788d17919c44260b35f969b8fb2705 Mon Sep 17 00:00:00 2001
From: Sadegh Hayeri <hayerisadegh@gmail.com>
Date: Wed, 30 Aug 2023 16:10:46 +0330
Subject: [PATCH] Fix VNC configs

Change-Id: Ib169ca0dff1a32a055c62a1bd9e9c1636a7f6634
---
 nova/Chart.yaml                                    | 2 +-
 nova/templates/bin/_nova-console-proxy-init.sh.tpl | 4 ++--
 releasenotes/notes/nova.yaml                       | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index b990122adb..87e4d6bc69 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.3.21
+version: 0.3.22
 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/bin/_nova-console-proxy-init.sh.tpl b/nova/templates/bin/_nova-console-proxy-init.sh.tpl
index f3eb9f3167..f3522c9c2b 100644
--- a/nova/templates/bin/_nova-console-proxy-init.sh.tpl
+++ b/nova/templates/bin/_nova-console-proxy-init.sh.tpl
@@ -19,7 +19,7 @@ set -ex
 console_kind="{{- .Values.console.console_kind -}}"
 
 if [ "${console_kind}" == "novnc" ] ; then
-    client_address="{{- .Values.conf.nova.vnc.vncserver_proxyclient_address -}}"
+    client_address="{{- .Values.conf.nova.vnc.server_proxyclient_address -}}"
     client_interface="{{- .Values.console.novnc.vncproxy.vncserver_proxyclient_interface -}}"
     listen_ip="{{- .Values.conf.nova.vnc.server_listen -}}"
 elif [ "${console_kind}" == "spice" ] ; then
@@ -49,7 +49,7 @@ fi
 if [ "${console_kind}" == "novnc" ] ; then
 cat <<EOF>/tmp/pod-shared/nova-vnc.ini
 [vnc]
-vncserver_proxyclient_address = $client_address
+server_proxyclient_address = $client_address
 server_listen = $listen_ip
 novncproxy_host = $listen_ip
 EOF
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 1f0940b0c1..fc47bcc28c 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -90,4 +90,5 @@ nova:
   - 0.3.19 Add support for enabling vencrypt
   - 0.3.20 Add cinder auth config
   - 0.3.21 Update health probe script considering ovsdb_connection config
+  - 0.3.22 Replace deprecated configuration vncserver_proxyclient_address to server_proxyclient_address
 ...