Merge "Remove config-internal for zaqar"

6 files changed, 3 insertions, 79 deletions

diff --git a/docker/centos/binary/zaqar/Dockerfile b/docker/centos/binary/zaqar/Dockerfile
index 0fcce2260..cb6217d26 100644
--- a/docker/centos/binary/zaqar/Dockerfile
+++ b/docker/centos/binary/zaqar/Dockerfile
@@ -3,9 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 RUN yum -y install openstack-zaqar && yum clean all
 
-COPY ./start.sh /start.sh
-COPY ./check.sh /check.sh
-
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/zaqar/check.sh b/docker/centos/binary/zaqar/check.sh
deleted file mode 120000
index 48c775659..000000000
--- a/docker/centos/binary/zaqar/check.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/check.sh
\ No newline at end of file
diff --git a/docker/centos/binary/zaqar/config-internal.sh b/docker/centos/binary/zaqar/config-internal.sh
deleted file mode 120000
index 9946142b4..000000000
--- a/docker/centos/binary/zaqar/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/zaqar/config-internal.sh
\ No newline at end of file
diff --git a/docker/common/zaqar/check.sh b/docker/common/zaqar/check.sh
deleted file mode 100755
index 4b3cdbb46..000000000
--- a/docker/common/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/common/zaqar/config-internal.sh b/docker/common/zaqar/config-internal.sh
deleted file mode 100755
index 4fd2bb112..000000000
--- a/docker/common/zaqar/config-internal.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /opt/kolla/kolla-common.sh
-
-check_required_vars KEYSTONE_ADMIN_SERVICE_HOST \
-                    KEYSTONE_ADMIN_TOKEN \
-                    PUBLIC_IP \
-                    ZAQAR_KEYSTONE_PASSWORD \
-                    ZAQAR_SERVER_SERVICE_HOST
-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
diff --git a/docker/common/zaqar/start.sh b/docker/common/zaqar/start.sh
index 4d3f75238..fa1050280 100755
--- a/docker/common/zaqar/start.sh
+++ b/docker/common/zaqar/start.sh
@@ -8,7 +8,7 @@ ARGS=""
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Config-internal script exec out of this function, it does not return here.
+# Execute config strategy
 set_configs
 
 # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases