From 5ed4be129c0d0d77047cb2a232edd1a66704f3a2 Mon Sep 17 00:00:00 2001 From: Yongfeng Du Date: Tue, 21 Jul 2015 14:01:12 +0800 Subject: [PATCH] Add get_or_create_domain for designate sink Function get_or_create_domain is required by designate-sink service, but get lost during later changes, so add it back. Otherwise, there will be "get_or_create_domain: command not found" error during designate sink start. Change-Id: I0433f83d02a2891c9bad4b9e26f93c4709ff1325 Closes-Bug: #1476575 --- .../designate-base/config-designate.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/docker/common/designate/designate-base/config-designate.sh b/docker/common/designate/designate-base/config-designate.sh index 5a31401eec..6edfd1bd24 100755 --- a/docker/common/designate/designate-base/config-designate.sh +++ b/docker/common/designate/designate-base/config-designate.sh @@ -4,6 +4,23 @@ set -e . /opt/kolla/kolla-common.sh +get_or_create_domain() { + local DOMAIN_NAME=$1 + + DOMAIN_ID=$(designate domain-create --name $DOMAIN_NAME | awk '/id/ { print $4; }') + # Searching domain if not created + if [ -z $DOMAIN_ID ]; then + DOMAIN_ID=$(designate domain-list | awk "/$DOMAIN_NAME/ { print \$2; }") + fi + # Fail if domain still don't exist + if [ -z $DOMAIN_ID ]; then + echo "Creating domain failed" 1>&2 + exit 1 + fi + + echo $DOMAIN_ID +} + check_required_vars DESIGNATE_DB_PASSWORD DESIGNATE_KEYSTONE_PASSWORD \ KEYSTONE_PUBLIC_SERVICE_HOST RABBITMQ_SERVICE_HOST \ DESIGNATE_BIND9_RNDC_KEY DESIGNATE_BACKEND \