Merge "glance: yaml indentation fixes"

This commit is contained in:
Zuul 2018-04-13 18:44:30 +00:00 committed by Gerrit Code Review
commit c868f4f2db

View File

@ -158,8 +158,8 @@ conf:
paste.filter_factory: glance.api.middleware.gzip:GzipMiddleware.factory paste.filter_factory: glance.api.middleware.gzip:GzipMiddleware.factory
filter:osprofiler: filter:osprofiler:
paste.filter_factory: osprofiler.web:WsgiMiddleware.factory paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
hmac_keys: SECRET_KEY #DEPRECATED hmac_keys: SECRET_KEY # DEPRECATED
enabled: yes #DEPRECATED enabled: yes # DEPRECATED
filter:cors: filter:cors:
paste.filter_factory: oslo_middleware.cors:filter_factory paste.filter_factory: oslo_middleware.cors:filter_factory
oslo_config_project: glance oslo_config_project: glance
@ -215,7 +215,7 @@ conf:
add_metadef_tags: '' add_metadef_tags: ''
glance: glance:
DEFAULT: DEFAULT:
#NOTE(portdirect): the bind port should not be defined, and is manipulated # NOTE(portdirect): the bind port should not be defined, and is manipulated
# via the endpoints section. # via the endpoints section.
bind_port: null bind_port: null
workers: 1 workers: 1
@ -260,11 +260,11 @@ conf:
paste.filter_factory: keystonemiddleware.auth_token:filter_factory paste.filter_factory: keystonemiddleware.auth_token:filter_factory
filter:osprofiler: filter:osprofiler:
paste.filter_factory: osprofiler.web:WsgiMiddleware.factory paste.filter_factory: osprofiler.web:WsgiMiddleware.factory
hmac_keys: SECRET_KEY #DEPRECATED hmac_keys: SECRET_KEY # DEPRECATED
enabled: yes #DEPRECATED enabled: yes # DEPRECATED
glance_registry: glance_registry:
DEFAULT: DEFAULT:
#NOTE(portdirect): the bind port should not be defined, and is manipulated # NOTE(portdirect): the bind port should not be defined, and is manipulated
# via the endpoints section. # via the endpoints section.
bind_port: null bind_port: null
workers: 1 workers: 1
@ -383,8 +383,8 @@ dependencies:
service: identity service: identity
rabbit_init: rabbit_init:
services: services:
- service: oslo_messaging - service: oslo_messaging
endpoint: internal endpoint: internal
registry: registry:
jobs: jobs:
- glance-storage-init - glance-storage-init
@ -575,11 +575,11 @@ pod:
glance: glance:
uid: 42424 uid: 42424
affinity: affinity:
anti: anti:
type: type:
default: preferredDuringSchedulingIgnoredDuringExecution default: preferredDuringSchedulingIgnoredDuringExecution
topologyKey: topologyKey:
default: kubernetes.io/hostname default: kubernetes.io/hostname
mounts: mounts:
glance_api: glance_api:
init_container: null init_container: null