diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml index 3871ee758e..fec531494a 100644 --- a/keystone/Chart.yaml +++ b/keystone/Chart.yaml @@ -14,7 +14,7 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Keystone name: keystone -version: 0.2.10 +version: 0.2.11 home: https://docs.openstack.org/keystone/latest/ icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png sources: diff --git a/keystone/templates/bin/_domain-manage.sh.tpl b/keystone/templates/bin/_domain-manage.sh.tpl index ea9cf84f8b..a697f1161a 100644 --- a/keystone/templates/bin/_domain-manage.sh.tpl +++ b/keystone/templates/bin/_domain-manage.sh.tpl @@ -16,7 +16,7 @@ limitations under the License. set -e 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 }} diff --git a/keystone/templates/job-domain-manage.yaml b/keystone/templates/job-domain-manage.yaml index 24efacc277..1571d5cc8e 100644 --- a/keystone/templates/job-domain-manage.yaml +++ b/keystone/templates/job-domain-manage.yaml @@ -81,7 +81,7 @@ spec: - name: pod-tmp mountPath: /tmp - 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 mountPath: /etc/keystone - name: keystone-bin @@ -104,7 +104,7 @@ spec: {{- end }} {{- range $k, $v := .Values.conf.ks_domains }} - 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 readOnly: true {{- end }} diff --git a/keystone/values.yaml b/keystone/values.yaml index 35025e2101..5f0e7aa1f8 100644 --- a/keystone/values.yaml +++ b/keystone/values.yaml @@ -528,7 +528,7 @@ conf: expiration: 43200 identity: domain_specific_drivers_enabled: True - domain_config_dir: /etc/keystonedomains + domain_config_dir: /etc/keystone/domains fernet_tokens: key_repository: /etc/keystone/fernet-keys/ credential: diff --git a/keystone/values_overrides/ldap.yaml b/keystone/values_overrides/ldap.yaml index d30ee5307b..96f5e8f154 100644 --- a/keystone/values_overrides/ldap.yaml +++ b/keystone/values_overrides/ldap.yaml @@ -18,7 +18,7 @@ conf: default_domain_id: default domain_specific_drivers_enabled: True domain_configurations_from_database: True - domain_config_dir: /etc/keystonedomains + domain_config_dir: /etc/keystone/domains ks_domains: ldapdomain: identity: diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml index e1c7e9e20b..dd92c9e72a 100644 --- a/releasenotes/notes/keystone.yaml +++ b/releasenotes/notes/keystone.yaml @@ -26,4 +26,5 @@ keystone: - 0.2.8 Remove member bootstrap logic - 0.2.9 Add Victoria and Wallaby releases support - 0.2.10 Make internal TLS more robust + - 0.2.11 Add missing slash ...