diff options
| author | Yongfeng Du <dolpher.du@intel.com> | 2015-07-21 14:01:12 +0800 |
|---|---|---|
| committer | Yongfeng Du <dolpher.du@intel.com> | 2015-07-21 17:22:02 +0800 |
| commit | 5ed4be129c0d0d77047cb2a232edd1a66704f3a2 (patch) | |
| tree | 050229221916b1ccf6675b44a19d6e4c07959be1 /docker/common/designate | |
| parent | 3dd31aad8aca04ea4da58bcd74679eacedcf302c (diff) | |
| download | kolla-5ed4be129c0d0d77047cb2a232edd1a66704f3a2.tar.gz kolla-5ed4be129c0d0d77047cb2a232edd1a66704f3a2.zip | |
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
Diffstat (limited to 'docker/common/designate')
| -rwxr-xr-x | docker/common/designate/designate-base/config-designate.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/docker/common/designate/designate-base/config-designate.sh b/docker/common/designate/designate-base/config-designate.sh index 5a31401ee..6edfd1bd2 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 \ |