diff --git a/glance/templates/bin/_post.sh.tpl b/glance/templates/bin/_post.sh.tpl index 3ee65fd939..8aa44495fd 100644 --- a/glance/templates/bin/_post.sh.tpl +++ b/glance/templates/bin/_post.sh.tpl @@ -21,7 +21,7 @@ ansible localhost -vvv -m kolla_keystone_service -a "service_name=glance \ service_type=image \ description='Openstack Image' \ endpoint_region='{{ .Values.keystone.glance_region_name }}' \ -url='{{ include "helm-toolkit.endpoint_glance_api_internal" . }}' \ +url='{{ tuple "image" "admin" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}' \ interface=admin \ region_name='{{ .Values.keystone.admin_region_name }}' \ auth='{{ include "helm-toolkit.keystone_auth" . }}'" \ @@ -31,7 +31,7 @@ ansible localhost -vvv -m kolla_keystone_service -a "service_name=glance \ service_type=image \ description='Openstack Image' \ endpoint_region='{{ .Values.keystone.glance_region_name }}' \ -url='{{ include "helm-toolkit.endpoint_glance_api_internal" . }}' \ +url='{{ tuple "image" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}' \ interface=internal \ region_name='{{ .Values.keystone.admin_region_name }}' \ auth='{{ include "helm-toolkit.keystone_auth" . }}'" \ @@ -41,7 +41,7 @@ ansible localhost -vvv -m kolla_keystone_service -a "service_name=glance \ service_type=image \ description='Openstack Image' \ endpoint_region='{{ .Values.keystone.glance_region_name }}' \ -url='{{ include "helm-toolkit.endpoint_glance_api_internal" . }}' \ +url='{{ tuple "image" "public" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }}' \ interface=public \ region_name='{{ .Values.keystone.admin_region_name }}' \ auth='{{ include "helm-toolkit.keystone_auth" . }}'" \ diff --git a/glance/templates/etc/_glance-api.conf.tpl b/glance/templates/etc/_glance-api.conf.tpl index f291b9884b..03648ab9e9 100644 --- a/glance/templates/etc/_glance-api.conf.tpl +++ b/glance/templates/etc/_glance-api.conf.tpl @@ -22,27 +22,28 @@ workers = {{ .Values.misc.workers }} registry_host = glance-registry # Enable Copy-on-Write show_image_direct_url = True - + [database] connection = mysql+pymysql://{{ .Values.database.glance_user }}:{{ .Values.database.glance_password }}@{{ .Values.database.address }}/{{ .Values.database.glance_database_name }} max_retries = -1 - + [keystone_authtoken] -auth_uri = {{ .Values.keystone.auth_uri }} -auth_url = {{ .Values.keystone.auth_url }} +auth_version = v3 +auth_url = {{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} auth_type = password -project_domain_id = default -user_domain_id = default -project_name = service +region_name = {{ .Values.keystone.glance_region_name }} +project_domain_name = {{ .Values.keystone.glance_project_domain }} +project_name = {{ .Values.keystone.glance_project_name }} +user_domain_name = {{ .Values.keystone.glance_user_domain }} username = {{ .Values.keystone.glance_user }} password = {{ .Values.keystone.glance_password }} - + [paste_deploy] flavor = keystone - + [oslo_messaging_notifications] driver = noop - + [glance_store] filesystem_store_datadir = /var/lib/glance/images/ {{- if .Values.development.enabled }} diff --git a/glance/templates/etc/_glance-registry.conf.tpl b/glance/templates/etc/_glance-registry.conf.tpl index e7c80adbbd..24f60dc62b 100644 --- a/glance/templates/etc/_glance-registry.conf.tpl +++ b/glance/templates/etc/_glance-registry.conf.tpl @@ -16,25 +16,27 @@ debug = {{ .Values.misc.debug }} use_syslog = False use_stderr = True + bind_port = {{ .Values.network.port.registry }} workers = {{ .Values.misc.workers }} - + [database] connection = mysql+pymysql://{{ .Values.database.glance_user }}:{{ .Values.database.glance_password }}@{{ .Values.database.address }}/{{ .Values.database.glance_database_name }} max_retries = -1 - + [keystone_authtoken] -auth_uri = {{ .Values.keystone.auth_uri }} -auth_url = {{ .Values.keystone.auth_url }} +auth_version = v3 +auth_url = {{ tuple "identity" "internal" "api" . | include "helm-toolkit.keystone_endpoint_uri_lookup" }} auth_type = password -project_domain_id = default -user_domain_id = default -project_name = service +region_name = {{ .Values.keystone.glance_region_name }} +project_domain_name = {{ .Values.keystone.glance_project_domain }} +project_name = {{ .Values.keystone.glance_project_name }} +user_domain_name = {{ .Values.keystone.glance_user_domain }} username = {{ .Values.keystone.glance_user }} password = {{ .Values.keystone.glance_password }} - + [paste_deploy] flavor = keystone - + [oslo_messaging_notifications] driver = noop diff --git a/glance/values.yaml b/glance/values.yaml index 51e4cd98bc..4d09b50c4d 100644 --- a/glance/values.yaml +++ b/glance/values.yaml @@ -46,22 +46,25 @@ upgrades: max_surge: 3 keystone: - auth_uri: "http://keystone-api:5000" - auth_url: "http://keystone-api:35357" admin_user: "admin" + admin_user_domain: "default" admin_password: "password" admin_project_name: "admin" + admin_project_domain: "default" admin_region_name: "RegionOne" glance_user: "glance" + glance_user_domain: "default" + glance_user_role: "admin" glance_password: "password" + glance_project_name: "service" + glance_project_domain: "default" glance_region_name: "RegionOne" network: port: api: 9292 registry: 9191 - ip_address: "0.0.0.0" database: address: mariadb @@ -173,21 +176,21 @@ dependencies: # values, but should include all endpoints # required by this chart endpoints: - glance: + identity: + name: keystone + hosts: + default: keystone-api + path: /v3 + scheme: 'http' + port: + admin: 35357 + api: 5000 + image: + name: glance hosts: default: glance-api - type: image path: null scheme: 'http' port: api: 9292 registry: 9191 - keystone: - hosts: - default: keystone-api - path: /v3 - type: identity - scheme: 'http' - port: - admin: 35357 - public: 5000