X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopenstack.sh;h=a5b8a8ca0bb0d25163207efb02d7c6485ab44d80;hb=d1aaa3704c4bb65a5f45ccfc1cb5d8bf18e6fb32;hp=5bee7d08fab363a108d0d8419488ed71a19b35c5;hpb=5c8efee7378402456f0688a3c841ba477315a4ed;p=joid.git

diff --git a/ci/openstack.sh b/ci/openstack.sh
index 5bee7d08..a5b8a8ca 100755
--- a/ci/openstack.sh
+++ b/ci/openstack.sh
@@ -14,6 +14,8 @@ opnfvlab=$2
 opnfvdistro=$3
 opnfvos=$4
 
+jujuver=`juju --version`
+
 if [ -f ./deployconfig.yaml ];then
     EXTERNAL_NETWORK=`grep floating-ip-range deployconfig.yaml | cut -d ' ' -f 4 `
 
@@ -45,23 +47,39 @@ update_gw_mac() {
     ## get gateway mac
     EXTNET_GW_MAC=$(juju ssh nova-compute/0 "arp -a ${EXTNET_GW} | grep -Eo '([0-9a-fA-F]{2})(([/\s:-][0-9a-fA-F]{2}){5})'")
     ## set external gateway mac in onos
-    juju set onos-controller gateway-mac=$EXTNET_GW_MAC
+    if [[ "$jujuver" < "2" ]]; then
+        juju set onos-controller gateway-mac=$EXTNET_GW_MAC
+    else
+        juju config onos-controller gateway-mac=$EXTNET_GW_MAC
+    fi
 }
 
 unitAddress() {
-        juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
+    if [[ "$jujuver" < "2" ]]; then
+        juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
+    else
+        juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"public-address\"]" 2> /dev/null
+    fi
 }
 
 unitMachine() {
-        juju status | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
+    if [[ "$jujuver" < "2" ]]; then
+        juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"services\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
+    else
+        juju status --format yaml | python -c "import yaml; import sys; print yaml.load(sys.stdin)[\"applications\"][\"$1\"][\"units\"][\"$1/$2\"][\"machine\"]" 2> /dev/null
+    fi
 }
 
 keystoneIp() {
-    KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //')
-    if [ $(echo $KEYSTONE|wc -w) == 1 ];then
-        echo $KEYSTONE
+    KEYSTONE=$(juju status keystone --format=short | grep " keystone")
+    if [ $(echo $KEYSTONE|wc -l) == 1 ];then
+        unitAddress keystone 0
     else
-        juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']"
+        if [[ "$jujuver" < "2" ]]; then
+            juju get keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']"
+        else
+            juju config keystone | python -c "import yaml; import sys; print yaml.load(sys.stdin)['settings']['vip']['value']"
+        fi
     fi
 }
 
@@ -69,9 +87,14 @@ keystoneIp() {
 create_openrc() {
     mkdir -m 0700 -p cloud
     keystoneIp=$(keystoneIp)
-    adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
-    configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > cloud/admin-openrc
-    chmod 0600 cloud/admin-openrc
+    if [[ "$jujuver" < "2" ]]; then
+        adminPasswd=$(juju get keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
+    else
+        adminPasswd=$(juju config keystone | grep admin-password -A 5 | grep value | awk '{print $2}' 2> /dev/null)
+    fi
+
+    configOpenrc admin $adminPasswd admin http://$keystoneIp:5000/v2.0 RegionOne > ~/joid_config/admin-openrc
+    chmod 0600 ~/joid_config/admin-openrc
 }
 
 configOpenrc() {
@@ -103,8 +126,14 @@ fi
 
 if [ "$API_FQDN" != "None" ]; then
     # Push api fqdn local ip to all /etc/hosts
-    API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\
-        print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']")
+    if [[ "$jujuver" < "2" ]]; then
+        API_FQDN=$(juju get keystone | python -c "import yaml; import sys;\
+            print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']")
+    else
+        API_FQDN=$(juju config keystone | python -c "import yaml; import sys;\
+            print yaml.load(sys.stdin)['settings']['os-public-hostname']['value']")
+    fi
+
 
     KEYSTONEIP=$(keystoneIp)
     juju run --all "if grep $API_FQDN /etc/hosts > /dev/null; then \
@@ -134,11 +163,32 @@ create_openrc
 
 echo "...... deploy public api proxy ......"
 
-if [ "$opnfvlab" == "orangepod1" ] && [ "$opnfvsdn" == "nosdn" ]; then # only for first test phase
+if ([ "$opnfvlab" == "orangepod1" ] \
+    || [ "$opnfvlab" == "intelpod6" ]) \
+    && [ "$opnfvsdn" == "nosdn" ] \
+    && [ "$API_FQDN" != "None" ]; then # only for first test phase
     if [ -e ./labconfig.yaml ]; then
-        PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2)
+        PUB_API_MASK=$(grep floating-ip-range ./labconfig.yaml |cut -d/ -f2)
+        PUB_API_NET=$(grep floating-ip-range ./labconfig.yaml |cut -d, -f4)
         PUB_API_IP=$(grep public-api-ip ./labconfig.yaml |cut -d: -f2)
-        juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_NET} dev br-ex" || true
+        if grep "- type: public" ./labconfig.yaml; then
+            # The public network exists on MAAS, so we push the dns record to it
+
+            # Recover maas ips and login to it
+            maas_ip=$(grep " ip_address" deployment.yaml | cut -d ':' -f 2 | sed -e 's/ //')
+            maas_pubip=$(grep floating-ip-range ./labconfig.yaml |cut -d, -f4 |perl -pe 's!^(.*)\.\d+/\d+$!$1.5!')
+            apikey=$(grep maas-oauth: environments.yaml | cut -d "'" -f 2)
+            maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey}
+
+            # Configure maas to add the record
+            CLUSTER_UUID=$(maas ubuntu node-groups list | grep uuid | cut -d\" -f4)
+            PUBLIC_MAAS_IF=$(maas ubuntu node-group-interfaces list $cluster_uuid |\
+                             python -c "import yaml; import sys; cfg=yaml.load(sys.stdin); net_h={net['ip']:net['name'] for net in cfg}; print(net_h['$maas_pubip'])")
+            maas maas node-group-interface update ${CLUSTER_UUID} ${PUBLIC_MAAS_IF} static_ip_range_high=${PUB_API_IP} static_ip_range_low=${PUB_API_IP}
+            maas maas ipaddresses reserve network=${PUB_API_NET} requested_address=${PUB_API_IP} hostname=${API_FQDN}
+            dig ${PUB_API_IP} @${maas_ip} # just for log
+        fi
+        juju run --unit nodes/0 "sudo ip a a ${PUB_API_IP}/${PUB_API_MASK} dev br-ex" || true
         juju run --unit nodes/0 "sudo ip l set dev br-ex up" || true
         python genPublicAPIProxyBundle.py -l labconfig.yaml >> bundles.yaml
         juju-deployer -vW -d -t 7200 -r 5 -c bundles.yaml $opnfvdistro-"$opnfvos" || true