From d8a7af93eb7b05c74082526b23cb4347851d95cf Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Wed, 6 May 2015 05:12:58 -0700
Subject: [PATCH] Remove Zaqar for Icehouse
Zaqar was introduced in Juno, so remove it prior to branching
icehouse, then add it back in after branching icehouse.
Partially-implements: port-kilo
Change-Id: Icce95b4d404e6d8238206716e74f6826bc860860
---
README.md | 1 -
docker/base/service_hosts.sh | 3 --
docker/zaqar/Dockerfile | 15 --------
docker/zaqar/build | 1 -
docker/zaqar/check.sh | 10 ------
docker/zaqar/start.sh | 67 ------------------------------------
6 files changed, 97 deletions(-)
delete mode 100644 docker/zaqar/Dockerfile
delete mode 120000 docker/zaqar/build
delete mode 100755 docker/zaqar/check.sh
delete mode 100755 docker/zaqar/start.sh
diff --git a/README.md b/README.md
index da3a68224..5caa7a24f 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 c3006f720..99e52f8fc 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 d4db63dc3..000000000
--- 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 d2accf7d3..000000000
--- 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 4b3cdbb46..000000000
--- 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 7620a1859..000000000
--- 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 <<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
-
-# TODO Switch to mongodb
-# https://bugs.launchpad.net/kolla/+bug/1394727
-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
--
GitLab