From 24dca1e12485ad9ed28a90d1fb878505d920732f Mon Sep 17 00:00:00 2001 From: Jeff Peeler Date: Wed, 19 Nov 2014 12:21:30 -0500 Subject: [PATCH] Implement zaqar container The current implementation has been configured to use sqlite instead of mongodb, since that container service is not yet available. Also, there are no Icehouse RPMs available, so the Juno RPMs are fetched and manually installed. Implements: blueprint kube-zaqar-container Change-Id: Ie875ab43ad3db92ae2712492ee151fbad0fec3cc --- docker/zaqar/Dockerfile | 17 +++++++ docker/zaqar/build | 1 + docker/zaqar/check.sh | 10 ++++ docker/zaqar/start.sh | 68 +++++++++++++++++++++++++++ k8s/pod/zaqar-pod.yaml | 19 ++++++++ k8s/service/zaqar-server-service.yaml | 7 +++ tools/start-all-pods | 1 + tools/start-all-services | 1 + 8 files changed, 124 insertions(+) create mode 100644 docker/zaqar/Dockerfile create mode 120000 docker/zaqar/build create mode 100755 docker/zaqar/check.sh create mode 100755 docker/zaqar/start.sh create mode 100644 k8s/pod/zaqar-pod.yaml create mode 100644 k8s/service/zaqar-server-service.yaml diff --git a/docker/zaqar/Dockerfile b/docker/zaqar/Dockerfile new file mode 100644 index 0000000000..fa37fa07be --- /dev/null +++ b/docker/zaqar/Dockerfile @@ -0,0 +1,17 @@ +FROM kollaglue/fedora-rdo-base +MAINTAINER Kolla Project (https://launchpad.net/kolla) + +RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora-21/openstack-zaqar-2014.2-1.fc22.noarch.rpm +RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora-21/python-oslo-utils-0.3.0-1.fc22.noarch.rpm +RUN curl -O https://repos.fedorapeople.org/repos/openstack/openstack-juno/fedora-21/python-keystonemiddleware-1.2.0-1.fc22.noarch.rpm +RUN yum -y localinstall python-oslo-utils-0.3.0-1.fc22.noarch.rpm \ + python-keystonemiddleware-1.2.0-1.fc22.noarch.rpm \ + openstack-zaqar-2014.2-1.fc22.noarch.rpm \ + ; yum clean all + +EXPOSE 8888 + +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 0000000000..d2accf7d39 --- /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 0000000000..4b3cdbb464 --- /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 0000000000..7ed89a40ad --- /dev/null +++ b/docker/zaqar/start.sh @@ -0,0 +1,68 @@ +#!/bin/sh + +set -e + +. /opt/kolla/kolla-common.sh + +: ${ADMIN_TENANT_NAME:=admin} + +: ${ZAQAR_DB_NAME:=zaqar} +: ${ZAQAR_DB_USER:=zaqar} + +: ${ZAQAR_KEYSTONE_USER:=zaqar} + +: ${KEYSTONE_AUTH_PROTOCOL:=http} + +check_required_vars ZAQAR_DB_PASSWORD ZAQAR_KEYSTONE_PASSWORD \ + KEYSTONE_ADMIN_TOKEN +dump_vars + +#check_for_mongodb +check_for_keystone + +cat > /openrc <