Readd Zaqar for Juno series since that was where it was introduced

Change-Id: I379844bb46d9ac1b933124b1736b7594700f88a8
Partially-implements: blueprint port-kilo

6 files changed, 88 insertions, 0 deletions

diff --git a/README.md b/README.md
index 5caa7a24f..7c1c3e7ed 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ services:
 * Mongodb
 * Ceilometer
 * Horizon
+* Zaqar
 
 ```
 $ sudo docker search kollaglue
diff --git a/docker/base/service_hosts.sh b/docker/base/service_hosts.sh
index 99e52f8fc..c3006f720 100755
--- a/docker/base/service_hosts.sh
+++ b/docker/base/service_hosts.sh
@@ -40,3 +40,6 @@
 : ${NOVA_METADATA_API_SERVICE_PORT:=8775}
 : ${RABBITMQ_SERVICE_HOST:=$RABBITMQ_PORT_5672_TCP_ADDR}
 : ${RABBITMQ_SERVICE_PORT:=5672}
+: ${ZAQAR_SERVER_SERVICE_HOST:=$ZAQAR_SERVER_PORT_8888_TCP_ADDR}
+: ${ZAQAR_SERVER_SERVICE_PORT:=8888}
+
diff --git a/docker/zaqar/Dockerfile b/docker/zaqar/Dockerfile
new file mode 100644
index 000000000..956f90825
--- /dev/null
+++ b/docker/zaqar/Dockerfile
@@ -0,0 +1,9 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install openstack-zaqar && yum clean all
+
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
+
+CMD ["/start.sh"]
diff --git a/docker/zaqar/build b/docker/zaqar/build
new file mode 120000
index 000000000..d2accf7d3
--- /dev/null
+++ b/docker/zaqar/build
@@ -0,0 +1 @@
+../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/zaqar/check.sh b/docker/zaqar/check.sh
new file mode 100755
index 000000000..4b3cdbb46
--- /dev/null
+++ b/docker/zaqar/check.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+status=$(curl -s -w "%{http_code}" -o /dev/null http://localhost:8888/v1/queues)
+
+if [[ $status -ne 200 && $status -ne 204 ]]; then
+    echo "ERROR($status): queue list failed"
+    exit $status
+fi
+
+exit 0
diff --git a/docker/zaqar/start.sh b/docker/zaqar/start.sh
new file mode 100755
index 000000000..6c68fccf2
--- /dev/null
+++ b/docker/zaqar/start.sh
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+set -e
+
+. /opt/kolla/kolla-common.sh
+
+: ${ADMIN_TENANT_NAME:=admin}
+: ${ZAQAR_KEYSTONE_USER:=zaqar}
+: ${KEYSTONE_AUTH_PROTOCOL:=http}
+
+check_required_vars ZAQAR_KEYSTONE_PASSWORD ZAQAR_SERVER_SERVICE_HOST \
+                    KEYSTONE_ADMIN_SERVICE_HOST KEYSTONE_ADMIN_TOKEN \
+                    PUBLIC_IP
+dump_vars
+
+#check_for_mongodb
+check_for_keystone
+
+cat > /openrc <<EOF
+export OS_AUTH_URL="http://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
+export OS_USERNAME="${ZAQAR_KEYSTONE_USER}"
+export OS_PASSWORD="${ZAQAR_KEYSTONE_PASSWORD}"
+export OS_TENANT_NAME="${ADMIN_TENANT_NAME}"
+EOF
+
+cfg=/etc/zaqar/zaqar.conf
+
+crudini --set $cfg DEFAULT log_file \
+    ""
+crudini --set $cfg DEFAULT use_stderr \
+    true
+
+crudini --set $cfg drivers storage \
+    sqlite
+
+crudini --set $cfg keystone_authtoken admin_password \
+    "${ZAQAR_KEYSTONE_PASSWORD}"
+crudini --set $cfg keystone_authtoken admin_user \
+    "${ZAQAR_KEYSTONE_USER}"
+crudini --set $cfg  keystone_authtoken admin_tenant_name \
+    "${ADMIN_TENANT_NAME}"
+crudini --set $cfg keystone_authtoken auth_uri \
+    "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_SERVICE_HOST}:5000/v2.0"
+crudini --set $cfg keystone_authtoken auth_protocol \
+    "${KEYSTONE_AUTH_PROTOCOL}"
+crudini --set $cfg keystone_authtoken auth_host \
+    "${KEYSTONE_PUBLIC_SERVICE_HOST}"
+crudini --set $cfg keystone_authtoken auth_port \
+    5000
+
+
+export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
+export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:35357/v2.0"
+crux user-create -n ${ZAQAR_KEYSTONE_USER} \
+    -p ${ZAQAR_KEYSTONE_PASSWORD} \
+    -t ${ADMIN_TENANT_NAME} \
+    -r admin
+
+crux endpoint-create --remove-all -n ${ZAQAR_KEYSTONE_USER} -t messaging \
+    -I "${KEYSTONE_AUTH_PROTOCOL}://${ZAQAR_SERVER_SERVICE_HOST}:8888" \
+    -P "${KEYSTONE_AUTH_PROTOCOL}://${PUBLIC_IP}:8888" \
+    -A "${KEYSTONE_AUTH_PROTOCOL}://${ZAQAR_SERVER_SERVICE_HOST}:8888"
+
+exec /usr/bin/zaqar-server