openstack/kolla-ansible
Code Issues Proposed changes

Add get_or_create_domain for designate sink

Browse Source 
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
This commit is contained in:
Yongfeng Du 2015-07-21 14:01:12 +08:00
parent 3dd31aad8a
commit 5ed4be129c
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docker/common/designate/designate-base/config-designate.sh
View File

@ -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 \