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:
uid: 42424
affinity:
anti:
type:
default: preferredDuringSchedulingIgnoredDuringExecution
topologyKey:
default: kubernetes.io/hostname
anti:
type:
default: preferredDuringSchedulingIgnoredDuringExecution
topologyKey:
default: kubernetes.io/hostname
mounts:
cinder_api:
init_container: null
@ -710,7 +711,7 @@ conf:
glance_api_version: 2
os_region_name: RegionOne
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.
osapi_volume_listen_port: null
enabled_backends: "rbd1"
@ -843,8 +844,8 @@ dependencies:
service: identity
rabbit_init:
services:
- service: oslo_messaging
endpoint: internal
- service: oslo_messaging
endpoint: internal
scheduler:
jobs:
- cinder-db-sync
@ -988,7 +989,7 @@ endpoints:
path:
default: '/v1/%(tenant_id)s'
scheme:
default: 'http'
default: 'http'
port:
api:
default: 8776
@ -1003,7 +1004,7 @@ endpoints:
path:
default: '/v2/%(tenant_id)s'
scheme:
default: 'http'
default: 'http'
port:
api:
default: 8776