summaryrefslogtreecommitdiffstats
path: root/docker/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-10 17:32:22 +0000
committerGerrit Code Review <review@openstack.org>2017-05-10 17:32:22 +0000
commitf0339522a8055991ec55fd12e10ef3923f1da66c (patch)
tree07e083837a0f79b24e9713266a14dcd61a5d595f /docker/services
parent340dfd4d2f2add386ac92e222023988a529ad96f (diff)
parent3e3569b95adfffd351149ef26c9352da05d04ac4 (diff)
Merge "Use httpd in Zaqar docker service"
Diffstat (limited to 'docker/services')
-rw-r--r--docker/services/zaqar.yaml8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml
index 5ba044ea..07abf07d 100644
--- a/docker/services/zaqar.yaml
+++ b/docker/services/zaqar.yaml
@@ -59,7 +59,7 @@ outputs:
- [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ]
kolla_config:
/var/lib/kolla/config_files/zaqar.json:
- command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf
+ command: /usr/sbin/httpd -DFOREGROUND
/var/lib/kolla/config_files/zaqar_websocket.json:
command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf --config-file /etc/zaqar/1.conf
permissions:
@@ -73,6 +73,9 @@ outputs:
net: host
privileged: false
restart: always
+ # NOTE(mandre) kolla image changes the user to 'zaqar', we need it
+ # to be root to run httpd
+ user: root
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
@@ -108,5 +111,4 @@ outputs:
upgrade_tasks:
- name: Stop and disable zaqar service
tags: step2
- service: name=openstack-zaqar.service state=stopped enabled=no
-
+ service: name=httpd state=stopped enabled=no