diff --git a/README.md b/README.md index da3a682244..5caa7a24ff 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,6 @@ services: * Neutron * Mongodb * Ceilometer -* Zaqar * Horizon ``` diff --git a/docker/base/service_hosts.sh b/docker/base/service_hosts.sh index c3006f720a..99e52f8fca 100755 --- a/docker/base/service_hosts.sh +++ b/docker/base/service_hosts.sh @@ -40,6 +40,3 @@ : ${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 deleted file mode 100644 index d4db63dc33..0000000000 --- a/docker/zaqar/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%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 - -ADD ./start.sh /start.sh -ADD ./check.sh /check.sh - -CMD ["/start.sh"] diff --git a/docker/zaqar/build b/docker/zaqar/build deleted file mode 120000 index d2accf7d39..0000000000 --- a/docker/zaqar/build +++ /dev/null @@ -1 +0,0 @@ -../../tools/build-docker-image \ No newline at end of file diff --git a/docker/zaqar/check.sh b/docker/zaqar/check.sh deleted file mode 100755 index 4b3cdbb464..0000000000 --- a/docker/zaqar/check.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 deleted file mode 100755 index 7620a18591..0000000000 --- a/docker/zaqar/start.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -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 - -# TODO Check for mongodb availability -# https://bugs.launchpad.net/kolla/+bug/1394727 -fail_unless_os_service_running keystone - -cat > /openrc <