From d77e5389f0d183cd9b2779e6f5abd10afa3a13d8 Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Fri, 24 Mar 2023 14:37:01 -0400
Subject: [PATCH] fix: vnc access

The VNC port option was changed long ago..

Let's catch up.

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

diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index acc0486b0a..0287383cb8 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.5
+version: 0.3.6
 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-compute-init.sh.tpl b/nova/templates/bin/_nova-console-compute-init.sh.tpl
index 6718fabb44..cb3333052e 100644
--- a/nova/templates/bin/_nova-console-compute-init.sh.tpl
+++ b/nova/templates/bin/_nova-console-compute-init.sh.tpl
@@ -53,7 +53,7 @@ if [ "${console_kind}" == "novnc" ] ; then
   cat > /tmp/pod-shared/nova-console.conf <<EOF
 [vnc]
 server_proxyclient_address = $client_address
-vncserver_listen = $listen_ip
+server_listen = $listen_ip
 EOF
 elif [ "${console_kind}" == "spice" ] ; then
   cat > /tmp/pod-shared/nova-console.conf <<EOF
diff --git a/nova/templates/bin/_nova-console-proxy-init.sh.tpl b/nova/templates/bin/_nova-console-proxy-init.sh.tpl
index 16636920ac..f3eb9f3167 100644
--- a/nova/templates/bin/_nova-console-proxy-init.sh.tpl
+++ b/nova/templates/bin/_nova-console-proxy-init.sh.tpl
@@ -21,7 +21,7 @@ console_kind="{{- .Values.console.console_kind -}}"
 if [ "${console_kind}" == "novnc" ] ; then
     client_address="{{- .Values.conf.nova.vnc.vncserver_proxyclient_address -}}"
     client_interface="{{- .Values.console.novnc.vncproxy.vncserver_proxyclient_interface -}}"
-    listen_ip="{{- .Values.conf.nova.vnc.vncserver_listen -}}"
+    listen_ip="{{- .Values.conf.nova.vnc.server_listen -}}"
 elif [ "${console_kind}" == "spice" ] ; then
     client_address="{{- .Values.conf.nova.spice.server_proxyclient_address -}}"
     client_interface="{{- .Values.console.spice.proxy.server_proxyclient_interface -}}"
@@ -50,7 +50,7 @@ if [ "${console_kind}" == "novnc" ] ; then
 cat <<EOF>/tmp/pod-shared/nova-vnc.ini
 [vnc]
 vncserver_proxyclient_address = $client_address
-vncserver_listen = $listen_ip
+server_listen = $listen_ip
 novncproxy_host = $listen_ip
 EOF
 elif [ "${console_kind}" == "spice" ] ; then
diff --git a/nova/values.yaml b/nova/values.yaml
index d1a52caa07..70eba6eb67 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -1363,7 +1363,7 @@ conf:
       resume_guests_state_on_host_boot: True
     vnc:
       novncproxy_host: 0.0.0.0
-      vncserver_listen: 0.0.0.0
+      server_listen: 0.0.0.0
       # This would be set by each compute nodes's ip
       # server_proxyclient_address: 127.0.0.1
     spice:
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 1f87a5f382..072fc64bb0 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -74,4 +74,5 @@ nova:
   - 0.3.3 Update all Ceph images to Focal
   - 0.3.4 Add OVN values_override, disable dependency to ovn-agent and vif configs for ovn
   - 0.3.5 Replace node-role.kubernetes.io/master with control-plane
+  - 0.3.6 Fix VNC access issues
 ...