Skip to content
This repository was archived by the owner on Jul 24, 2019. It is now read-only.

Commit b1ce9b0

Browse files
committed
Add glance registry config
1 parent b31a365 commit b1ce9b0

4 files changed

Lines changed: 46 additions & 1 deletion

File tree

glance/templates/configmap-etc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,7 @@ data:
1313
{{ tuple "etc/_glance-api-paste.ini.tpl" . | include "template" | indent 4 }}
1414
glance-registry.conf: |+
1515
{{ tuple "etc/_glance-registry.conf.tpl" . | include "template" | indent 4 }}
16+
glance-registry-paste.ini: |+
17+
{{ tuple "etc/_glance-registry-paste.ini.tpl" . | include "template" | indent 4 }}
1618
policy.json: |+
1719
{{ tuple "etc/_policy.json.tpl" . | include "template" | indent 4 }}

glance/templates/deployment-api.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
command:
3737
- glance-api
3838
- --config-file
39-
- /etc/glance/glance-registry.conf
39+
- /etc/glance/glance-api.conf
4040
ports:
4141
- containerPort: {{ .Values.network.port.api }}
4242
readinessProbe:

glance/templates/deployment-registry.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,14 @@ spec:
4141
mountPath: /etc/glance/glance-registry.conf
4242
subPath: glance-registry.conf
4343
readOnly: true
44+
- name: glanceregistrypaste
45+
mountPath: /etc/glance/glance-registry-paste.ini
46+
subPath: glance-registry-paste.ini
47+
readOnly: true
48+
- name: glancepolicy
49+
mountPath: /etc/glance/policy.json
50+
subPath: policy.json
51+
readOnly: true
4452
volumes:
4553
- name: etcglance
4654
emptyDir: {}
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
# Use this pipeline for no auth - DEFAULT
2+
[pipeline:glance-registry]
3+
pipeline = healthcheck osprofiler unauthenticated-context registryapp
4+
5+
# Use this pipeline for keystone auth
6+
[pipeline:glance-registry-keystone]
7+
pipeline = healthcheck osprofiler authtoken context registryapp
8+
9+
# Use this pipeline for authZ only. This means that the registry will treat a
10+
# user as authenticated without making requests to keystone to reauthenticate
11+
# the user.
12+
[pipeline:glance-registry-trusted-auth]
13+
pipeline = healthcheck osprofiler context registryapp
14+
15+
[app:registryapp]
16+
paste.app_factory = glance.registry.api:API.factory
17+
18+
[filter:healthcheck]
19+
paste.filter_factory = oslo_middleware:Healthcheck.factory
20+
backends = disable_by_file
21+
disable_by_file_path = /etc/glance/healthcheck_disable
22+
23+
[filter:context]
24+
paste.filter_factory = glance.api.middleware.context:ContextMiddleware.factory
25+
26+
[filter:unauthenticated-context]
27+
paste.filter_factory = glance.api.middleware.context:UnauthenticatedContextMiddleware.factory
28+
29+
[filter:authtoken]
30+
paste.filter_factory = keystonemiddleware.auth_token:filter_factory
31+
32+
[filter:osprofiler]
33+
paste.filter_factory = osprofiler.web:WsgiMiddleware.factory
34+
hmac_keys = SECRET_KEY #DEPRECATED
35+
enabled = yes #DEPRECATED

0 commit comments

Comments
 (0)