openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use httpd in Zaqar docker service"

This commit is contained in:
Jenkins 2017-05-10 17:32:22 +00:00 committed by Gerrit Code Review
parent 340dfd4d2f 3e3569b95a
commit f0339522a8
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/services/zaqar.yaml
View File

@ -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