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
Add heat parameter for all of config_volume images
[apex-tripleo-heat-templates.git]
/
docker
/
services
/
haproxy.yaml
diff --git
a/docker/services/haproxy.yaml
b/docker/services/haproxy.yaml
index
1f8bcfa
..
242f075
100644
(file)
--- a/
docker/services/haproxy.yaml
+++ b/
docker/services/haproxy.yaml
@@
-12,6
+12,10
@@
parameters:
description: image
default: 'centos-binary-haproxy:latest'
type: string
description: image
default: 'centos-binary-haproxy:latest'
type: string
+ DockerHAProxyConfigImage:
+ description: The container image to use for the haproxy config_volume
+ default: 'centos-binary-haproxy:latest'
+ type: string
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-85,17
+89,20
@@
outputs:
config_volume: haproxy
puppet_tags: haproxy_config
step_config: *step_config
config_volume: haproxy
puppet_tags: haproxy_config
step_config: *step_config
- config_image:
&haproxy_image
+ config_image:
list_join:
- '/'
list_join:
- '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ]
+ - [ {get_param: DockerNamespace}, {get_param: DockerHAProxy
Config
Image} ]
kolla_config:
/var/lib/kolla/config_files/haproxy.json:
command: haproxy -f /etc/haproxy/haproxy.cfg
docker_config:
step_1:
haproxy:
kolla_config:
/var/lib/kolla/config_files/haproxy.json:
command: haproxy -f /etc/haproxy/haproxy.cfg
docker_config:
step_1:
haproxy:
- image: *haproxy_image
+ image:
+ list_join:
+ - '/'
+ - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ]
net: host
privileged: false
restart: always
net: host
privileged: false
restart: always