summaryrefslogtreecommitdiffstats
path: root/docker/services/zaqar.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'docker/services/zaqar.yaml')
-rw-r--r--docker/services/zaqar.yaml16
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index ea1fd768..b6b4e4b1 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -4,17 +4,11 @@ description: >
OpenStack containerized Zaqar services
parameters:
- DockerNamespace:
- description: namespace
- default: 'tripleoupstream'
- type: string
DockerZaqarImage:
description: image
- default: 'centos-binary-zaqar:latest'
type: string
DockerZaqarConfigImage:
description: The container image to use for the zaqar config_volume
- default: 'centos-binary-zaqar:latest'
type: string
EndpointMap:
default: {}
@@ -67,10 +61,7 @@ outputs:
config_volume: zaqar
puppet_tags: zaqar_config
step_config: *step_config
- config_image:
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerZaqarConfigImage} ]
+ config_image: {get_param: DockerZaqarConfigImage}
kolla_config:
/var/lib/kolla/config_files/zaqar.json:
command: /usr/sbin/httpd -DFOREGROUND
@@ -93,10 +84,7 @@ outputs:
docker_config:
step_4:
zaqar:
- image: &zaqar_image
- list_join:
- - '/'
- - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
+ image: &zaqar_image {get_param: DockerZaqarImage}
net: host
privileged: false
restart: always