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 "Make *AdminStateUp parameters consistent"
[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
..
07315e7
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:
@@
-82,14
+81,18
@@
outputs:
kolla_config:
/var/lib/kolla/config_files/cinder_api.json:
command: /usr/sbin/httpd -DFOREGROUND
kolla_config:
/var/lib/kolla/config_files/cinder_api.json:
command: /usr/sbin/httpd -DFOREGROUND
+ config_files:
+ - source: "/var/lib/kolla/config_files/src/*"
+ dest: "/"
+ merge: true
+ preserve_properties: true
permissions:
- path: /var/log/cinder
owner: cinder:cinder
recurse: true
docker_config:
permissions:
- path: /var/log/cinder
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
+102,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
+114,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'
@@
-128,9
+133,7
@@
outputs:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/cinder_api.json:/var/lib/kolla/config_files/config.json:ro
- - /var/lib/config-data/cinder/etc/cinder/:/etc/cinder/:ro
- - /var/lib/config-data/cinder/etc/httpd/:/etc/httpd/:ro
- - /var/lib/config-data/cinder/var/www/:/var/www/:ro
+ - /var/lib/config-data/puppet-generated/cinder/:/var/lib/kolla/config_files/src:ro
- /var/log/containers/cinder:/var/log/cinder
-
if:
- /var/log/containers/cinder:/var/log/cinder
-
if: