X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fjoid%2Fjoid-deploy.sh;h=05c2de1fcf5b58c6177d012bf8522a76bba942d4;hb=c9ea476389a4a5d26840be8c96ce97c5d657ff46;hp=59ba01588bcd053aed8b942e3b8a1eefc3923875;hpb=28a9e274ffe85aac6d80cf00029e1d1a2f0a39f8;p=releng.git

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 59ba01588..05c2de1fc 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -10,10 +10,8 @@
 set +e
 set -o nounset
 
-PWD_FILENAME="passwords.sh"
-
-##
 ##
+## Functions
 ##
 function exit_on_error {
     RES=$1
@@ -24,54 +22,23 @@ function exit_on_error {
     fi
 }
 
-
 ##
 ## Create LAB_CONFIG folder if not exists
 ##
-mkdir -p $LAB_CONFIG
 
-##
-## Override default passwords with local settings if needed
-##
-
-if [ -e "$LAB_CONFIG/$PWD_FILENAME" ]; then
-    echo "------ Load local passwords ------"
-    source $LAB_CONFIG/$PWD_FILENAME
-else
-    export MAAS_USER=ubuntu
-    export MAAS_PASSWORD=ubuntu
-    export OS_ADMIN_PASSWORD=openstack
-fi
+mkdir -p $LAB_CONFIG
 
 ##
 ## Set Joid pod config name
 ##
-    # This part will be removed when pod names will be synced between jenkins and joid config
-    case $NODE_NAME in
-        orange-fr-pod2)
-            POD=orange-pod2 ;;
-        juniper-us-test-1)
-            POD=juniper-pod1 ;;
-        *virtual*)
-            POD=default ;;
-        *)
-            POD=$NODE_NAME ;;
-    esac
-    export POD_NAME=${POD/-}
 
-##
-## Parse Network config
-##
-
-EXTERNAL_NETWORK=${EXTERNAL_NETWORK:-}
-# split EXTERNAL_NETWORK=name;type;first ip;last ip; gateway;network
-IFS=';' read -r -a EXTNET <<< "$EXTERNAL_NETWORK"
-EXTNET_NAME=${EXTNET[0]}
-EXTNET_TYPE=${EXTNET[1]}
-EXTNET_FIP=${EXTNET[2]}
-EXTNET_LIP=${EXTNET[3]}
-EXTNET_GW=${EXTNET[4]}
-EXTNET_NET=${EXTNET[5]}
+case $NODE_NAME in
+    *virtual*)
+        POD=default ;;
+    *)
+        POD=$NODE_NAME ;;
+esac
+export POD_NAME=${POD/-}
 
 ##
 ## Redeploy MAAS or recover the previous config
@@ -81,13 +48,13 @@ cd $WORKSPACE/ci
 if [ -e "$LAB_CONFIG/environments.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
     echo "------ Recover Juju environment to use MAAS ------"
     cp $LAB_CONFIG/environments.yaml .
+    cp $LAB_CONFIG/deployment.yaml .
+    if [ -e $LAB_CONFIG/deployconfig.yaml ]; then
+        cp $LAB_CONFIG/deployconfig.yaml .
+    fi
 else
-    MAASCONFIG=$WORKSPACE/ci/maas/${POD/-*}/${POD/*-}/deployment.yaml
-    echo "------ Set MAAS password ------"
-    sed -i -- "s/user: ubuntu/user: $MAAS_USER/" $MAASCONFIG
-    sed -i -- "s/password: ubuntu/password: $MAAS_PASSWORD/" $MAASCONFIG
     echo "------ Redeploy MAAS ------"
-    ./02-maasdeploy.sh $POD_NAME
+    ./00-maasdeploy.sh $POD_NAME
     exit_on_error $? "MAAS Deploy FAILED"
 fi
 
@@ -121,32 +88,25 @@ fi
 if [ "$HA_MODE" == 'noha' ]; then
     HA_MODE='nonha'
 fi
-SRCBUNDLE="${WORKSPACE}/ci/${SDN_CONTROLLER}/juju-deployer/"
-SRCBUNDLE="${SRCBUNDLE}/ovs-${SDN_CONTROLLER}-${HA_MODE}.yaml"
-
-
-# Modify Bundle
-echo "------ Set openstack password ------"
-sed -i -- "s/admin-password: openstack/admin-password: $OS_ADMIN_PASSWORD/" $SRCBUNDLE
 
-if [ -n "$EXTNET_NAME" ]; then
-    echo "------ Set openstack default network ------"
-    sed -i -- "s/neutron-external-network: ext_net/neutron-external-network: $EXTNET_NAME/" $SRCBUNDLE
+# Add extra to features
+if [ "$EXTRA" != "" ];then
+    NFV_FEATURES="${NFV_FEATURES}_${EXTRA}"
 fi
 
-echo "------ Set ceph disks ------"
-#Find the first line of osd-devices to change the one for ceph, then the other for ceph-osd
-sed -i -- "s@osd-devices: /srv@osd-devices: $CEPH_DISKS@" $SRCBUNDLE
-sed -i -r -- "s/^(\s+osd-reformat: )'no'/\1'$CEPH_REFORMAT'/" $SRCBUNDLE
+# temporary sfc feature is availble only on onos and trusty
+if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
+    UBUNTU_DISTRO=trusty
+fi
 
 ##
 ## Configure Joid deployment
 ##
 
 echo "------ Deploy with juju ------"
-echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME"
+echo "Execute: ./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES"
 
-./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME
+./deploy.sh -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES
 exit_on_error $? "Main deploy FAILED"
 
 ##
@@ -155,17 +115,6 @@ exit_on_error $? "Main deploy FAILED"
 JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
 echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
 
-# get Keystone ip
-case "$HA_MODE" in
-    "ha")
-        KEYSTONE=$(cat bundles.yaml |shyaml get-value openstack-phase2.services.keystone.options.vip)
-        ;;
-    *)
-        KEYSTONE=$(juju status keystone |grep public-address|sed -- 's/.*\: //')
-        ;;
-esac
-
-
 # get controller IP
 case "$SDN_CONTROLLER" in
     "odl")
@@ -180,13 +129,10 @@ case "$SDN_CONTROLLER" in
 esac
 SDN_PASSWORD='admin'
 
-# export the openrc file
-cat << EOF > $JOID_ADMIN_OPENRC
-export OS_USERNAME=admin
-export OS_PASSWORD=$OS_ADMIN_PASSWORD
-export OS_TENANT_NAME=admin
-export OS_AUTH_URL=http://$KEYSTONE:5000/v2.0
-export OS_REGION_NAME=Canonical
+# export the openrc file by getting the one generated by joid and add SDN
+# controller for Functest
+cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
+cat << EOF >> $JOID_ADMIN_OPENRC
 export SDN_CONTROLLER=$SDN_CONTROLLER_IP
 export SDN_PASSWORD=$SDN_PASSWORD
 EOF
@@ -197,50 +143,9 @@ EOF
 
 echo "------ Backup Juju environment ------"
 cp environments.yaml $LAB_CONFIG/
-
-##
-## Basic test to return a realistic result to jenkins
-##
-
-echo "------ Do basic test ------"
-source $JOID_ADMIN_OPENRC
-curl -i -sw '%{http_code}' -H "Content-Type: application/json"   -d "
-{ \"auth\": {
-    \"identity\": {
-      \"methods\": [\"password\"],
-      \"password\": {
-        \"user\": {
-          \"name\": \"admin\",
-          \"domain\": { \"id\": \"default\" },
-          \"password\": \"$OS_ADMIN_PASSWORD\"
-        }
-      }
-    }
-  }
-}"   http://$KEYSTONE:5000/v3/auth/tokens |grep "HTTP/1.1 20" 2>&1 >/dev/null;
-exit_on_error $? "Deploy FAILED to auth to openstack"
-
-
-##
-## Create external network if needed
-##
-
-# If we have more information than only the name, try to create it
-if [ -z "$EXTNET_TYPE" ]; then
-    echo "------ No data for external network creation, pass ------"
-elif [[ "$DEPLOY_SCENARIO" =~ "onos" ]]; then
-    echo "------ ONOS have created the external network, pass ------"
-else
-    echo "------ External network creation ------"
-    neutron net-create $EXTNET_NAME --router:external True \
-      --provider:physical_network external --provider:network_type $EXTNET_TYPE
-    exit_on_error $? "External network creation failed"
-    neutron subnet-create $EXTNET_NAME --name $EXTNET_NAME \
-      --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
-      --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
-    exit_on_error $? "External subnet creation failed"
-    neutron net-update $EXTNET_NAME --shared
-    exit_on_error $? "External network sharing failed"
+cp deployment.yaml $LAB_CONFIG/
+if [ -e deployconfig.yaml ]; then
+    cp deployconfig.yaml $LAB_CONFIG
 fi
 
 ##