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 "adding --config-dir parameters to neutron containers"
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
panko-api.yaml
diff --git
a/docker/services/panko-api.yaml
b/docker/services/panko-api.yaml
index
c381c0d
..
0f55606
100644
(file)
--- a/
docker/services/panko-api.yaml
+++ b/
docker/services/panko-api.yaml
@@
-14,6
+14,10
@@
parameters:
description: image
default: 'centos-binary-panko-api:latest'
type: string
description: image
default: 'centos-binary-panko-api:latest'
type: string
+ DockerPankoConfigImage:
+ description: The container image to use for the panko config_volume
+ default: 'centos-binary-panko-api:latest'
+ type: string
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
@@
-75,10
+79,10
@@
outputs:
config_volume: panko
puppet_tags: panko_api_paste_ini,panko_config
step_config: *step_config
config_volume: panko
puppet_tags: panko_api_paste_ini,panko_config
step_config: *step_config
- config_image:
&panko_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerPanko
Api
Image} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerPanko
Config
Image} ]
kolla_config:
/var/lib/kolla/config_files/panko_api.json:
command: /usr/sbin/httpd -DFOREGROUND
kolla_config:
/var/lib/kolla/config_files/panko_api.json:
command: /usr/sbin/httpd -DFOREGROUND
@@
-87,17
+91,19
@@
outputs:
owner: panko:panko
recurse: true
docker_config:
owner: panko:panko
recurse: true
docker_config:
- step_
3
:
+ step_
2
:
panko_init_log:
panko_init_log:
- start_order: 0
- image: *panko_image
+ image: &panko_api_image
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerPankoApiImage} ]
user: root
volumes:
- /var/log/containers/panko:/var/log/panko
command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko']
user: root
volumes:
- /var/log/containers/panko:/var/log/panko
command: ['/bin/bash', '-c', 'mkdir -p /var/log/httpd; chown -R panko:panko /var/log/panko']
+ step_3:
panko_db_sync:
panko_db_sync:
- start_order: 1
- image: *panko_image
+ image: *panko_api_image
net: host
detach: false
privileged: false
net: host
detach: false
privileged: false
@@
-112,7
+118,7
@@
outputs:
step_4:
panko_api:
start_order: 2
step_4:
panko_api:
start_order: 2
- image: *panko_image
+ image: *panko_
api_
image
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always