Add a network config item for novncproxy
In deployment-novncproxy.yaml, it set hostNetwork = true. We want to let it use cluster network instead of hostNetwork. This patch will add a config item, so that we can override it to use cluster network. Then no need to enable 6080 port in local network firewall for novncproxy access. Upstream patch submitted as below. https://review.opendev.org/#/c/679891 Below test pass! Access to VM console through horizon works! Closes-bug: 1827246 Change-Id: Icb0cfa39839e151d5869c64bc8f0151d0d9faf49 Signed-off-by: zhipengl <zhipengs.liu@intel.com>
This commit is contained in:
parent
379bcc5ad3
commit
2e63d41e5c
@ -39,6 +39,7 @@ Patch17: 0017-Cinder-support-multiple-ceph-volume-backends.patch
|
|||||||
Patch18: 0018-Nova-add-service-token.patch
|
Patch18: 0018-Nova-add-service-token.patch
|
||||||
Patch19: 0019-Add-TLS-support-for-Aodh-and-Panko-public-endpoints.patch
|
Patch19: 0019-Add-TLS-support-for-Aodh-and-Panko-public-endpoints.patch
|
||||||
Patch20: 0020-Change-cinder-bootstrap-script.patch
|
Patch20: 0020-Change-cinder-bootstrap-script.patch
|
||||||
|
Patch21: 0021-Add-config-network-item-for-novncproxy.patch
|
||||||
|
|
||||||
BuildRequires: helm
|
BuildRequires: helm
|
||||||
BuildRequires: openstack-helm-infra
|
BuildRequires: openstack-helm-infra
|
||||||
@ -69,6 +70,7 @@ Openstack Helm charts
|
|||||||
%patch18 -p1
|
%patch18 -p1
|
||||||
%patch19 -p1
|
%patch19 -p1
|
||||||
%patch20 -p1
|
%patch20 -p1
|
||||||
|
%patch21 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# initialize helm and build the toolkit
|
# initialize helm and build the toolkit
|
||||||
|
@ -0,0 +1,42 @@
|
|||||||
|
From 6fba31f6ba8627c7314a46f5b54d59fd17858848 Mon Sep 17 00:00:00 2001
|
||||||
|
From: zhipengl <zhipengs.liu@intel.com>
|
||||||
|
Date: Wed, 4 Sep 2019 13:24:12 +0800
|
||||||
|
Subject: [PATCH] Patch21: 0021-Add-config-network-item-for-novncproxy.patch
|
||||||
|
|
||||||
|
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
|
||||||
|
---
|
||||||
|
nova/templates/deployment-novncproxy.yaml | 2 ++
|
||||||
|
nova/values.yaml | 2 ++
|
||||||
|
2 files changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/nova/templates/deployment-novncproxy.yaml b/nova/templates/deployment-novncproxy.yaml
|
||||||
|
index 2611ba8..1eebcfd 100644
|
||||||
|
--- a/nova/templates/deployment-novncproxy.yaml
|
||||||
|
+++ b/nova/templates/deployment-novncproxy.yaml
|
||||||
|
@@ -52,8 +52,10 @@ spec:
|
||||||
|
{{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
|
||||||
|
nodeSelector:
|
||||||
|
{{ .Values.labels.novncproxy.node_selector_key }}: {{ .Values.labels.novncproxy.node_selector_value }}
|
||||||
|
+{{- if .Values.pod.useHostNetwork.novncproxy }}
|
||||||
|
hostNetwork: true
|
||||||
|
dnsPolicy: ClusterFirstWithHostNet
|
||||||
|
+{{- end }}
|
||||||
|
initContainers:
|
||||||
|
{{ tuple $envAll "novncproxy" $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
||||||
|
- name: nova-novncproxy-init
|
||||||
|
diff --git a/nova/values.yaml b/nova/values.yaml
|
||||||
|
index ee00591..db86621 100644
|
||||||
|
--- a/nova/values.yaml
|
||||||
|
+++ b/nova/values.yaml
|
||||||
|
@@ -2050,6 +2050,8 @@ pod:
|
||||||
|
nova_spiceproxy:
|
||||||
|
volumeMounts:
|
||||||
|
volumes:
|
||||||
|
+ useHostNetwork:
|
||||||
|
+ novncproxy: true
|
||||||
|
replicas:
|
||||||
|
api_metadata: 1
|
||||||
|
compute_ironic: 1
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
@ -917,6 +917,8 @@ data:
|
|||||||
# here.
|
# here.
|
||||||
mandatory_access_control:
|
mandatory_access_control:
|
||||||
type: null
|
type: null
|
||||||
|
useHostNetwork:
|
||||||
|
novncproxy: false
|
||||||
replicas:
|
replicas:
|
||||||
api_metadata: 1
|
api_metadata: 1
|
||||||
osapi: 1
|
osapi: 1
|
||||||
@ -974,7 +976,6 @@ data:
|
|||||||
# declared down during controller swacts, reboots, etc...
|
# declared down during controller swacts, reboots, etc...
|
||||||
service_down_time: 90
|
service_down_time: 90
|
||||||
long_rpc_timeout: 400
|
long_rpc_timeout: 400
|
||||||
|
|
||||||
libvirt:
|
libvirt:
|
||||||
cpu_mode: host-model
|
cpu_mode: host-model
|
||||||
live_migration_completion_timeout: 180
|
live_migration_completion_timeout: 180
|
||||||
|
Loading…
Reference in New Issue
Block a user