Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Create NIC templates for Neutron Networker composable role"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
cinder-api.yaml
diff --git
a/docker/services/cinder-api.yaml
b/docker/services/cinder-api.yaml
index
062f5fc
..
6a5d74b
100644
(file)
--- a/
docker/services/cinder-api.yaml
+++ b/
docker/services/cinder-api.yaml
@@
-12,9
+12,8
@@
parameters:
description: image
default: 'centos-binary-cinder-api:latest'
type: string
description: image
default: 'centos-binary-cinder-api:latest'
type: string
- # we configure all cinder services in the same cinder base container
DockerCinderConfigImage:
DockerCinderConfigImage:
- description:
imag
e
+ description:
The container image to use for the cinder config_volum
e
default: 'centos-binary-cinder-api:latest'
type: string
EndpointMap:
default: 'centos-binary-cinder-api:latest'
type: string
EndpointMap:
@@
-87,9
+86,8
@@
outputs:
owner: cinder:cinder
recurse: true
docker_config:
owner: cinder:cinder
recurse: true
docker_config:
- step_
3
:
+ step_
2
:
cinder_api_init_logs:
cinder_api_init_logs:
- start_order: 0
image: &cinder_api_image
list_join:
- '/'
image: &cinder_api_image
list_join:
- '/'
@@
-99,6
+97,7
@@
outputs:
volumes:
- /var/log/containers/cinder:/var/log/cinder
command: ['/bin/bash', '-c', 'chown -R cinder:cinder /var/log/cinder']
volumes:
- /var/log/containers/cinder:/var/log/cinder
command: ['/bin/bash', '-c', 'chown -R cinder:cinder /var/log/cinder']
+ step_3:
cinder_api_db_sync:
image: *cinder_api_image
net: host
cinder_api_db_sync:
image: *cinder_api_image
net: host
@@
-110,6
+109,7
@@
outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
+ - /var/log/containers/cinder:/var/log/cinder
command:
- '/usr/bin/bootstrap_host_exec'
- 'cinder_api'
command:
- '/usr/bin/bootstrap_host_exec'
- 'cinder_api'