openstack/openstack-helm
Code Issues Proposed changes

Merge "Add option to set external policy to local for openstack services"

Browse Source
This commit is contained in:
Zuul 2017-11-08 03:39:16 +00:00 committed by Gerrit Code Review
commit 2af836c9d8
22 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
barbican/templates/service-api.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "barbican" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
barbican/values.yaml
View File

@ -134,6 +134,7 @@ network:
api:
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 39486

3
cinder/templates/service-api.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "cinder" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
cinder/values.yaml
View File

@ -195,6 +195,7 @@ network:
api:
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30877

3
glance/templates/service-api.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "glance" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

3
glance/templates/service-registry.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "glance" "registry" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.registry.node_port.enabled }}
type: NodePort
{{ if .Values.network.registry.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

2
glance/values.yaml
View File

@ -275,12 +275,14 @@ network:
ingress:
public: true
proxy_body_size: 1024M
external_policy_local: false
node_port:
enabled: false
port: 30092
registry:
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30091

3
gnocchi/templates/service-api.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "gnocchi" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
gnocchi/values.yaml
View File

@ -27,6 +27,7 @@ network:
api:
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 8041

3
heat/templates/service-api.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "heat" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
heat/values.yaml
View File

@ -221,6 +221,7 @@ network:
api:
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30004

9
horizon/templates/service.yaml
View File

@ -23,9 +23,9 @@ metadata:
name: {{ tuple "dashboard" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
spec:
ports:
{{ if .Values.network.enable_node_port }}
{{ if .Values.network.node_port.enabled }}
- name: http
nodePort: {{ .Values.network.node_port }}
nodePort: {{ .Values.network.node_port.port }}
port: {{ .Values.network.port }}
protocol: TCP
targetPort: {{ .Values.network.port }}
@ -37,7 +37,10 @@ spec:
{{ end }}
selector:
{{ tuple $envAll "horizon" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.enable_node_port }}
{{ if .Values.network.node_port.enabled }}
type: NodePort
{{ if .Values.network.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

8
horizon/values.yaml
View File

@ -33,11 +33,13 @@ labels:
node_selector_value: enabled
network:
port: 80
ingress:
public: true
port: 80
node_port: 31000
enable_node_port: false
external_policy_local: false
node_port:
enabled: false
port: 31000
# Use "True" and "False" as Titlecase strings with quotes, boolean
# values will not work

3
keystone/templates/service-api.yaml
View File

@ -37,5 +37,8 @@ spec:
{{ tuple $envAll "keystone" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if or (.Values.network.api.node_port.enabled) (.Values.network.admin.node_port.enabled) }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
keystone/values.yaml
View File

@ -53,6 +53,7 @@ network:
port: 80
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30500

3
magnum/templates/service-api.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "magnum" "api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.api.node_port.enabled }}
type: NodePort
{{ if .Values.network.api.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
magnum/values.yaml
View File

@ -115,6 +115,7 @@ network:
api:
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30511

3
neutron/templates/service-server.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "neutron" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.server.node_port.enabled }}
type: NodePort
{{ if .Values.network.server.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

1
neutron/values.yaml
View File

@ -91,6 +91,7 @@ network:
port: 9696
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30096

3
nova/templates/service-metadata.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "nova" "metadata" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.metadata.node_port.enabled }}
type: NodePort
{{ if .Values.network.metadata.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

3
nova/templates/service-osapi.yaml
View File

@ -32,5 +32,8 @@ spec:
{{ tuple $envAll "nova" "os-api" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.osapi.node_port.enabled }}
type: NodePort
{{ if .Values.network.osapi.external_policy_local }}
externalTrafficPolicy: Local
{{ end }}
{{ end }}
{{- end }}

2
nova/values.yaml
View File

@ -109,6 +109,7 @@ network:
port: 8774
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30774
@ -118,6 +119,7 @@ network:
port: 8775
ingress:
public: true
external_policy_local: false
node_port:
enabled: false
port: 30775