diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-04-16 21:38:33 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-04-16 21:39:02 -0400 |
| commit | 29545646feafeb1c5eef5fd3ae096625834e852a (patch) | |
| tree | 8f5a5682a58092cdf4b6d9d2202f74e8d41f7d37 | |
| parent | f9ba863198c97d8f9a6d27c8f44571a6a4c8d766 (diff) | |
Revert "Use httpd in Zaqar docker service"
This reverts commit 57a26486128982c9887edd02eb8897045215b10a.
Change-Id: I1bbe16a1a7a382ae0c898bd19cd64d3d49aa84c7
Closes-bug: #1683210
| -rw-r--r-- | docker/services/zaqar.yaml | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index 1160031f..21aff31a 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -56,7 +56,7 @@ outputs: - [ {get_param: DockerNamespace}, {get_param: DockerZaqarImage} ] kolla_config: /var/lib/kolla/config_files/zaqar.json: - command: /usr/sbin/httpd -DFOREGROUND + command: /usr/bin/zaqar-server --config-file /etc/zaqar/zaqar.conf /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 docker_config: @@ -66,13 +66,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: - /var/lib/kolla/config_files/zaqar.json:/var/lib/kolla/config_files/config.json:ro - /var/lib/config-data/zaqar/etc/zaqar/:/etc/zaqar/:ro - - /var/lib/config-data/zaqar/etc/httpd:/etc/httpd/:ro - /etc/hosts:/etc/hosts:ro - /etc/localtime:/etc/localtime:ro environment: @@ -92,4 +88,5 @@ outputs: upgrade_tasks: - name: Stop and disable zaqar service tags: step2 - service: name=httpd state=stopped enabled=no + service: name=openstack-zaqar.service state=stopped enabled=no + |