Fix zaqar container

This PS is part of a rework on zaqar container.
In it's current state is not working in kolla.
Will be adding/fixing issues under this PS.

- Remove bootstrap zaqar:
  At this point zaqar-manage command does not exist.
  Boostraping is not needed while starting zaqar container.

- Add pymongo package in source install.

- Create /var/log/kolla folder.

- Change zaqar homedir to /var/lib/zaqar and unify creation.

- Zaqar's source default have config files as *.sample.
  Policy.json need to be present if keystone auth
  is going to be used.

- Zaqar uses wsgi to the API, heka decoder need to be added

Change-Id: I9c6716b64345d9e846902ffbfbf033135e3eabd9
Closes-Bug: #1647831

2 files changed, 10 insertions, 11 deletions

diff --git a/docker/zaqar/Dockerfile.j2 b/docker/zaqar/Dockerfile.j2
index d6190a5b3..8fc42df28 100644..100755
--- a/docker/zaqar/Dockerfile.j2
+++ b/docker/zaqar/Dockerfile.j2
@@ -18,14 +18,14 @@ MAINTAINER {{ maintainer }}
 {{ macros.install_packages(zaqar_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
-
 ADD zaqar-archive /zaqar-source
 RUN ln -s zaqar-source/* zaqar \
-    && useradd --user-group zaqar \
-    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /zaqar \
-    && mkdir -p /etc/zaqar /var/log/zaqar /home/zaqar \
+    && useradd --user-group --create-home --home-dir /var/lib/zaqar zaqar \
+    && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt pymongo /zaqar \
+    && mkdir -p /etc/zaqar \
     && cp -r /zaqar/etc/* /etc/zaqar/ \
-    && chown -R zaqar: /etc/zaqar /var/log/zaqar /home/zaqar
+    && mv /etc/zaqar/policy.json.sample /etc/zaqar/policy.json \
+    && chown -R zaqar: /etc/zaqar
 
 {% endif %}
 
@@ -35,6 +35,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
 
 {% block zaqar_footer %}{% endblock %}
 {% block footer %}{% endblock %}
-{{ include_footer }}
 
 USER zaqar
diff --git a/docker/zaqar/extend_start.sh b/docker/zaqar/extend_start.sh
index 5498227b6..b7ce7bb04 100644..100755
--- a/docker/zaqar/extend_start.sh
+++ b/docker/zaqar/extend_start.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases
-# of the KOLLA_BOOTSTRAP variable being set, including empty.
-if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
-    zaqar zaqar-manage db_sync
-    exit 0
+if [[ ! -d "/var/log/kolla/zaqar" ]]; then
+    mkdir -p /var/log/kolla/zaqar
+fi
+if [[ $(stat -c %a /var/log/kolla/zaqar) != "755" ]]; then
+    chmod 755 /var/log/kolla/zaqar
 fi