openstack/openstack-helm
Code Issues Proposed changes

Keystone: use endpoints section and lookups to set port

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

Change-Id: I52c130ded9e76f9e74fce6e5b33d3950262dd7ad
This commit is contained in:
Pete Birley 2018-03-03 16:16:52 +00:00
parent 16c6d31155
commit ff0372be4f
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
keystone/templates/deployment-api.yaml
View File

@ -62,15 +62,15 @@ spec:
- /tmp/keystone-api.sh
- stop
ports:
- name: api-public
containerPort: {{ .Values.network.api.port }}
- name: api-admin
containerPort: {{ .Values.network.admin.port }}
- name: ks-pub
containerPort: {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
- name: ks-adm
containerPort: {{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
readinessProbe:
httpGet:
scheme: HTTP
path: /
port: {{ .Values.network.api.port }}
port: {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
initialDelaySeconds: 15
periodSeconds: 10
volumeMounts:

8
keystone/templates/etc/_wsgi-keystone.conf.tpl
View File

@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/}}
Listen 0.0.0.0:{{ .Values.network.api.port }}
Listen 0.0.0.0:{{ .Values.network.admin.port }}
Listen 0.0.0.0:{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
Listen 0.0.0.0:{{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" proxy
@ -24,7 +24,7 @@ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
CustomLog /dev/stdout combined env=!forwarded
CustomLog /dev/stdout proxy env=forwarded
<VirtualHost *:{{ .Values.network.api.port }}>
<VirtualHost *:{{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
WSGIDaemonProcess keystone-public processes=1 threads=4 user=keystone group=keystone display-name=%{GROUP}
WSGIProcessGroup keystone-public
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-public
@ -40,7 +40,7 @@ CustomLog /dev/stdout proxy env=forwarded
CustomLog /dev/stdout proxy env=forwarded
</VirtualHost>
<VirtualHost *:{{ .Values.network.admin.port }}>
<VirtualHost *:{{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}>
WSGIDaemonProcess keystone-admin processes=1 threads=4 user=keystone group=keystone display-name=%{GROUP}
WSGIProcessGroup keystone-admin
WSGIScriptAlias / /var/www/cgi-bin/keystone/keystone-wsgi-admin

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

@ -24,12 +24,12 @@ metadata:
spec:
ports:
- name: ks-pub
port: {{ .Values.network.api.port }}
port: {{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.api.node_port.enabled }}
nodePort: {{ .Values.network.api.node_port.port }}
{{ end }}
- name: ks-adm
port: {{ .Values.network.admin.port }}
port: {{ tuple "identity" "internal" "admin" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}
{{ if .Values.network.admin.node_port.enabled }}
nodePort: {{ .Values.network.admin.node_port.port }}
{{ end }}

2
keystone/values.yaml
View File

@ -58,7 +58,6 @@ bootstrap:
network:
api:
port: 80
ingress:
public: true
annotations:
@ -69,7 +68,6 @@ network:
enabled: false
port: 30500
admin:
port: 35357
node_port:
enabled: false
port: 30357