openstack/openstack-helm
Code Issues Proposed changes

Cinder: use endpoints section and lookups to set port

Browse Source 
This PS moves cinder to use the endpoints section and lookups to
set the port it serves on.

Change-Id: Ib95c89f1ff4d20eb3bb57aad325ae31f0ec52532
This commit is contained in:
Pete Birley 2018-03-03 15:50:37 +00:00
parent 16c6d31155
commit af92423d60
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/templates/configmap-etc.yaml
View File

@ -92,6 +92,9 @@ limitations under the License.
{{- end -}}
{{- end -}}
{{- if empty .Values.conf.cinder.DEFAULT.osapi_volume_listen_port -}}
{{- tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | set .Values.conf.cinder.DEFAULT "osapi_volume_listen_port" | quote | trunc 0 -}}
{{- end -}}
---
apiVersion: v1
kind: ConfigMap

4
cinder/templates/deployment-api.yaml
View File

@ -80,10 +80,10 @@ spec:
- stop
ports:
- name: c-api
containerPort: {{ .Values.conf.cinder.DEFAULT.osapi_volume_listen_port }}
containerPort: {{ tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe:
tcpSocket:
port: {{ .Values.conf.cinder.DEFAULT.osapi_volume_listen_port }}
port: {{ tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
volumeMounts:
- name: cinder-bin
mountPath: /tmp/cinder-api.sh

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

@ -24,7 +24,7 @@ metadata:
spec:
ports:
- name: c-api
port: {{ .Values.conf.cinder.DEFAULT.osapi_volume_listen_port }}
port: {{ tuple "volume" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.api.node_port.enabled }}
nodePort: {{ .Values.network.api.node_port.port }}
{{ end }}

4
cinder/values.yaml
View File

@ -447,7 +447,9 @@ conf:
glance_api_version: 2
os_region_name: RegionOne
host: cinder-volume-worker
osapi_volume_listen_port: 8776
#NOTE(portdirect): the bind port should not be defined, and is manipulated
# via the endpoints section.
osapi_volume_listen_port: null
enabled_backends: "rbd1"
# NOTE(portdirect): "cinder.backup.drivers.swift" and
# "cinder.backup.drivers.posix" also supported