Merge "cinder: yaml indentation fixes"

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

View File

@ -74,11 +74,12 @@ pod:
cinder: cinder:
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:
cinder_api: cinder_api:
init_container: null init_container: null
@ -710,7 +711,7 @@ conf:
glance_api_version: 2 glance_api_version: 2
os_region_name: RegionOne os_region_name: RegionOne
host: cinder-volume-worker host: cinder-volume-worker
#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.
osapi_volume_listen_port: null osapi_volume_listen_port: null
enabled_backends: "rbd1" enabled_backends: "rbd1"
@ -843,8 +844,8 @@ dependencies:
service: identity service: identity
rabbit_init: rabbit_init:
services: services:
- service: oslo_messaging - service: oslo_messaging
endpoint: internal endpoint: internal
scheduler: scheduler:
jobs: jobs:
- cinder-db-sync - cinder-db-sync
@ -988,7 +989,7 @@ endpoints:
path: path:
default: '/v1/%(tenant_id)s' default: '/v1/%(tenant_id)s'
scheme: scheme:
default: 'http' default: 'http'
port: port:
api: api:
default: 8776 default: 8776
@ -1003,7 +1004,7 @@ endpoints:
path: path:
default: '/v2/%(tenant_id)s' default: '/v2/%(tenant_id)s'
scheme: scheme:
default: 'http' default: 'http'
port: port:
api: api:
default: 8776 default: 8776