From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 10 Aug 2017 10:50:03 +0000 (-0500)
Subject: modfiied to check more strict API_DOMAIN
X-Git-Tag: opnfv-5.0.RC1~66
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F49%2F39049%2F1;p=joid.git

modfiied to check more strict API_DOMAIN

Change-Id: If45ad3e25243c666eeb420e9e43b3bc9896bcfa3
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/openstack.sh b/ci/openstack.sh
index ed082b9b..9020fd7c 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -150,7 +150,7 @@ export OS_AUTH_URL=$4
 EOF
 }
 
-if [ "$API_FQDN" != "None" ]; then
+if ([ $API_FQDN ] && [ $API_FQDN != "null" ] && [ $API_FQDN != "None"]); then
     # Push api fqdn local ip to all /etc/hosts
     if [[ "$jujuver" < "2" ]]; then
         API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\