aboutsummaryrefslogtreecommitdiffstats
path: root/docker/services/haproxy.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/haproxy.yaml')
-rw-r--r--docker/services/haproxy.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml
index 5fc9b2b..21baf5c 100644
--- a/docker/services/haproxy.yaml
+++ b/docker/services/haproxy.yaml
@@ -4,17 +4,11 @@ description: >
OpenStack containerized HAproxy service
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerHAProxyImage:
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
ServiceData:
default: {}
@@ -99,10 +93,7 @@ outputs:
config_volume: haproxy
puppet_tags: haproxy_config
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyConfigImage} ]
+ config_image: {get_param: DockerHAProxyConfigImage}
volumes: &deployed_cert_mount
- list_join:
- ':'
@@ -120,10 +111,7 @@ outputs:
docker_config:
step_1:
haproxy:
- image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerHAProxyImage} ]
+ image: {get_param: DockerHAProxyImage}
net: host
privileged: false
restart: always