From cb921ff9348fec9c634ef191dba293e33088daae Mon Sep 17 00:00:00 2001 From: Gerry Kopec Date: Fri, 15 Feb 2019 18:11:55 -0500 Subject: [PATCH] Update nova helm chart to fix console addressing Upstream nova helm chart attempts to figure out the address for VM consoles by running an init container that checks for ip routes and addresses on a compute host. It then sets the appropriate nova config options in a config file which it passes to nova-compute. However this effectively overwrites the same config option that stx has already set in nova.conf via per host overrides causing us to communicate over the wrong network or not to connect at all. This fix introduces an option to enable/disable passing of this additional config file to nova-compute. Default upstream behaviour is unchanged, but we will disable it in our overrides. Partial-Bug: #1815490 Change-Id: I86eb80578b23fd89b7f9643b943ee759f26a15be Signed-off-by: Gerry Kopec --- .../openstack-helm/centos/build_srpm.data | 2 +- .../openstack-helm/centos/openstack-helm.spec | 2 + ...a-console-address-config-optionality.patch | 42 +++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 openstack/openstack-helm/files/0010-Stein-Nova-console-address-config-optionality.patch diff --git a/openstack/openstack-helm/centos/build_srpm.data b/openstack/openstack-helm/centos/build_srpm.data index f207cde8..41fb015b 100644 --- a/openstack/openstack-helm/centos/build_srpm.data +++ b/openstack/openstack-helm/centos/build_srpm.data @@ -5,4 +5,4 @@ TAR="$TAR_NAME-$SHA.tar.gz" COPY_LIST="${CGCS_BASE}/downloads/$TAR $PKG_BASE/files/* " -TIS_PATCH_VER=10 +TIS_PATCH_VER=11 diff --git a/openstack/openstack-helm/centos/openstack-helm.spec b/openstack/openstack-helm/centos/openstack-helm.spec index efb1dfc7..0cd281d6 100644 --- a/openstack/openstack-helm/centos/openstack-helm.spec +++ b/openstack/openstack-helm/centos/openstack-helm.spec @@ -28,6 +28,7 @@ Patch07: 0007-Glance-chart-add-images-pool-replication.patch Patch08: 0007-Stein-Remove-ceilometer-upgrade-option.patch Patch09: 0008-Stein-Update-Cinder-to-include-resource_filters.json.patch Patch10: 0009-Stein-add-log_config_append-to-neutron-etc.patch +Patch11: 0010-Stein-Nova-console-address-config-optionality.patch BuildRequires: helm BuildRequires: openstack-helm-infra @@ -48,6 +49,7 @@ Openstack Helm charts %patch08 -p1 %patch09 -p1 %patch10 -p1 +%patch11 -p1 %build # initialize helm and build the toolkit diff --git a/openstack/openstack-helm/files/0010-Stein-Nova-console-address-config-optionality.patch b/openstack/openstack-helm/files/0010-Stein-Nova-console-address-config-optionality.patch new file mode 100644 index 00000000..7bb450d7 --- /dev/null +++ b/openstack/openstack-helm/files/0010-Stein-Nova-console-address-config-optionality.patch @@ -0,0 +1,42 @@ +From 9030eb81823e46eb374b52fec2e65fff2bb2dcf9 Mon Sep 17 00:00:00 2001 +From: Gerry Kopec +Date: Fri, 15 Feb 2019 16:15:37 -0500 +Subject: [PATCH] Stein: Nova console address config optionality + +Introduce option to nova to enable/disable the use of the vnc or spice +server proxyclient address found by the console compute init container. +This can be used to prevent the case where the found address overrides +what has already been defined in nova.conf by per host nova compute +daemonset overrides. +--- + nova/templates/bin/_nova-compute.sh.tpl | 2 ++ + nova/values.yaml | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/nova/templates/bin/_nova-compute.sh.tpl b/nova/templates/bin/_nova-compute.sh.tpl +index 84596a5..b3bcca7 100644 +--- a/nova/templates/bin/_nova-compute.sh.tpl ++++ b/nova/templates/bin/_nova-compute.sh.tpl +@@ -20,5 +20,7 @@ set -ex + + exec nova-compute \ + --config-file /etc/nova/nova.conf \ ++{{- if .Values.console.address_search_enabled }} + --config-file /tmp/pod-shared/nova-console.conf \ ++{{- end }} + --config-file /tmp/pod-shared/nova-libvirt.conf +diff --git a/nova/values.yaml b/nova/values.yaml +index 9646ded..c0ec7fe 100644 +--- a/nova/values.yaml ++++ b/nova/values.yaml +@@ -438,6 +438,7 @@ console: + vncproxy: + # IF blank, search default routing interface + vncserver_proxyclient_interface: ++ address_search_enabled: true + + ssh: + key_types: +-- +1.8.3.1 +