aboutsummaryrefslogtreecommitdiff
path: root/docker/common/designate/designate-api
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-07 09:10:15 -0700
committerSteven Dake <stdake@cisco.com>2015-08-07 22:33:00 -0700
commitba01f942068f2c38d446f9ec52b22bf93ed7aeb2 (patch)
tree66036f4fbb0b12939acfba38b21f2c8600093678 /docker/common/designate/designate-api
parentec272b8fe4da85351d549022829c6a2329666376 (diff)
downloadkolla-ba01f942068f2c38d446f9ec52b22bf93ed7aeb2.tar.gz
kolla-ba01f942068f2c38d446f9ec52b22bf93ed7aeb2.zip
Remove config-internal from designate
Change-Id: I15a9c34a08055c6f9ad53f211a8c1a62de3f58ff Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common/designate/designate-api')
-rwxr-xr-xdocker/common/designate/designate-api/config-internal.sh41
-rwxr-xr-xdocker/common/designate/designate-api/start.sh2
2 files changed, 1 insertions, 42 deletions
diff --git a/docker/common/designate/designate-api/config-internal.sh b/docker/common/designate/designate-api/config-internal.sh
deleted file mode 100755
index c7eb42c16..000000000
--- a/docker/common/designate/designate-api/config-internal.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-set -e
-
-. /opt/kolla/kolla-common.sh
-. /opt/kolla/config-designate.sh
-
-CONF=/etc/designate/designate.conf
-
-check_required_vars ADMIN_TENANT_NAME \
- DESIGNATE_API_SERVICE_HOST \
- DESIGNATE_API_SERVICE_PORT \
- DESIGNATE_KEYSTONE_PASSWORD \
- DESIGNATE_KEYSTONE_USER \
- KEYSTONE_ADMIN_SERVICE_HOST \
- KEYSTONE_ADMIN_SERVICE_PORT \
- KEYSTONE_AUTH_PROTOCOL \
- KEYSTONE_ADMIN_TOKEN
-
-export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v2.0"
-
-fail_unless_os_service_running keystone
-
-crux user-create \
- -n ${DESIGNATE_KEYSTONE_USER} \
- -p ${DESIGNATE_KEYSTONE_PASSWORD} \
- -t ${ADMIN_TENANT_NAME} \
- -r admin
-
-crux endpoint-create \
- --remove-all \
- -n ${DESIGNATE_KEYSTONE_USER} \
- -t dns \
- -I "${KEYSTONE_AUTH_PROTOCOL}://${DESIGNATE_API_SERVICE_HOST}:${DESIGNATE_API_SERVICE_PORT}/v1" \
- -P "${KEYSTONE_AUTH_PROTOCOL}://${DESIGNATE_API_SERVICE_HOST}:${DESIGNATE_API_SERVICE_PORT}/v1" \
- -A "${KEYSTONE_AUTH_PROTOCOL}://${DESIGNATE_API_SERVICE_HOST}:${DESIGNATE_API_SERVICE_PORT}/v1"
-
-crudini --set $CONF service:api api_paste_config "/usr/share/designate/api-paste.ini"
-crudini --set $CONF service:api api_port "${DESIGNATE_API_SERVICE_PORT}"
-
-exec /usr/bin/designate-api
diff --git a/docker/common/designate/designate-api/start.sh b/docker/common/designate/designate-api/start.sh
index 90d17bb53..fe556225b 100755
--- a/docker/common/designate/designate-api/start.sh
+++ b/docker/common/designate/designate-api/start.sh
@@ -7,7 +7,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