Merge "Add a config item for novncproxy"

This commit is contained in:
Zuul 2019-09-14 06:40:03 +00:00 committed by Gerrit Code Review
commit 82c72367c8
2 changed files with 4 additions and 0 deletions

View File

@ -52,8 +52,10 @@ spec:
{{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} {{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
nodeSelector: nodeSelector:
{{ .Values.labels.novncproxy.node_selector_key }}: {{ .Values.labels.novncproxy.node_selector_value }} {{ .Values.labels.novncproxy.node_selector_key }}: {{ .Values.labels.novncproxy.node_selector_value }}
{{- if .Values.pod.useHostNetwork.novncproxy }}
hostNetwork: true hostNetwork: true
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
{{- end }}
initContainers: initContainers:
{{ tuple $envAll "novncproxy" $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll "novncproxy" $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
- name: nova-novncproxy-init - name: nova-novncproxy-init

View File

@ -2277,6 +2277,8 @@ pod:
nova_db_sync: nova_db_sync:
volumeMounts: volumeMounts:
volumes: volumes:
useHostNetwork:
novncproxy: true
replicas: replicas:
api_metadata: 1 api_metadata: 1
compute_ironic: 1 compute_ironic: 1