openstack/openstack-helm
Code Issues Proposed changes

Add missing slash

Browse Source 
The default of 'domain_config_dir' in keystone is '/etc/keystone/domains'.
This patch adds the missing slash.

Change-Id: I30523ec3fd3144811a76b9078e915eff4ffa2b66
This commit is contained in:
ericxiett 2021-08-02 08:01:59 +00:00
parent 54da75fd71
commit c5105fd9da
6 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keystone/Chart.yaml
View File

@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0 appVersion: v1.0.0
description: OpenStack-Helm Keystone description: OpenStack-Helm Keystone
name: keystone name: keystone
version: 0.2.10 version: 0.2.11
home: https://docs.openstack.org/keystone/latest/ home: https://docs.openstack.org/keystone/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
sources: sources:

2
keystone/templates/bin/_domain-manage.sh.tpl
View File

@ -16,7 +16,7 @@ limitations under the License.
set -e set -e
endpt={{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }} endpt={{ tuple "identity" "internal" "api" . | include "helm-toolkit.endpoints.keystone_endpoint_uri_lookup" }}
path={{ .Values.conf.keystone.identity.domain_config_dir | default "/etc/keystonedomains" }} path={{ .Values.conf.keystone.identity.domain_config_dir | default "/etc/keystone/domains" }}
{{- range $k, $v := .Values.conf.ks_domains }} {{- range $k, $v := .Values.conf.ks_domains }}

4
keystone/templates/job-domain-manage.yaml
View File

@ -81,7 +81,7 @@ spec:
- name: pod-tmp - name: pod-tmp
mountPath: /tmp mountPath: /tmp
- name: etckeystonedomains - name: etckeystonedomains
mountPath: {{ .Values.conf.keystone.identity.domain_config_dir | default "/etc/keystonedomains" }} mountPath: {{ .Values.conf.keystone.identity.domain_config_dir | default "/etc/keystone/domains" }}
- name: etckeystone - name: etckeystone
mountPath: /etc/keystone mountPath: /etc/keystone
- name: keystone-bin - name: keystone-bin
@ -104,7 +104,7 @@ spec:
{{- end }} {{- end }}
{{- range $k, $v := .Values.conf.ks_domains }} {{- range $k, $v := .Values.conf.ks_domains }}
- name: keystone-etc - name: keystone-etc
mountPath: {{ $envAll.Values.conf.keystone.identity.domain_config_dir | default "/etc/keystonedomains" }}/keystone.{{ $k }}.json mountPath: {{ $envAll.Values.conf.keystone.identity.domain_config_dir | default "/etc/keystone/domains" }}/keystone.{{ $k }}.json
subPath: keystone.{{ $k }}.json subPath: keystone.{{ $k }}.json
readOnly: true readOnly: true
{{- end }} {{- end }}

2
keystone/values.yaml
View File

@ -528,7 +528,7 @@ conf:
expiration: 43200 expiration: 43200
identity: identity:
domain_specific_drivers_enabled: True domain_specific_drivers_enabled: True
domain_config_dir: /etc/keystonedomains domain_config_dir: /etc/keystone/domains
fernet_tokens: fernet_tokens:
key_repository: /etc/keystone/fernet-keys/ key_repository: /etc/keystone/fernet-keys/
credential: credential:

2
keystone/values_overrides/ldap.yaml
View File

@ -18,7 +18,7 @@ conf:
default_domain_id: default default_domain_id: default
domain_specific_drivers_enabled: True domain_specific_drivers_enabled: True
domain_configurations_from_database: True domain_configurations_from_database: True
domain_config_dir: /etc/keystonedomains domain_config_dir: /etc/keystone/domains
ks_domains: ks_domains:
ldapdomain: ldapdomain:
identity: identity:

1
releasenotes/notes/keystone.yaml
View File

@ -26,4 +26,5 @@ keystone:
- 0.2.8 Remove member bootstrap logic - 0.2.8 Remove member bootstrap logic
- 0.2.9 Add Victoria and Wallaby releases support - 0.2.9 Add Victoria and Wallaby releases support
- 0.2.10 Make internal TLS more robust - 0.2.10 Make internal TLS more robust
- 0.2.11 Add missing slash
... ...