Merge "cleanup code"

diff --combined ci/deploy.sh
index a6a1b18,a061f0e..560807f
--- 1/ci/deploy.sh
--- 2/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -25,7 -25,7 +25,7 @@@ usage() { echo "Usage: $
      [-t|--type <noha|ha|tip>]
      [-o|--openstack <ocata>]
      [-l|--lab <default|custom>]
 -    [-f|--feature <ipv6,dpdk,lxd,dvr,openbaton>]
 +    [-f|--feature <ipv6,dpdk,lxd,dvr,openbaton,multus>]
      [-d|--distro <xenial>]
      [-a|--arch <amd64|ppc64el|aarch64>]
      [-m|--model <openstack|kubernetes>]
@@@ -227,7 -227,7 +227,7 @@@ deploy() 
          ./cleanvm.sh || true
  
          if [ "$virtinstall" -eq 1 ]; then
-             ./00-maasdeploy.sh virtual
+             ./03-maasdeploy.sh virtual
          else
              if [ -z "$labfile" ]; then
                  if [ ! -e ./labconfig.yaml ]; then
@@@ -248,7 -248,7 +248,7 @@@
                  cp $labfile ./labconfig.yaml
              fi
  
-             ./00-maasdeploy.sh custom
+             ./03-maasdeploy.sh custom
          fi
      fi
  
@@@ -318,8 -318,6 +318,6 @@@ juju status --format=tabula
  # translate bundle.yaml to json
  python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < bundles.yaml > bundles.json
  
- jujuver=`juju --version`
- 
  # Configuring deployment
  if ([ $opnfvmodel == "openstack" ]); then
      echo_info "Configuring OpenStack deployment"
@@@ -327,13 -325,8 +325,8 @@@
      ./openstack.sh "$opnfvsdn" "$opnfvlab" "$opnfvdistro" "$openstack" || true
  
      # creating heat domain after pushing the public API into /etc/hosts
-     if [[ "$jujuver" > "2" ]]; then
-         status=`juju run-action heat/0 domain-setup`
-         echo $status
-     else
-         status=`juju action do heat/0 domain-setup`
-         echo $status
-     fi
+     status=`juju run-action heat/0 domain-setup`
+     echo $status
  
      sudo ../juju/get-cloud-images || true
      ../juju/joid-configure-openstack || true
@@@ -348,7 -341,7 +341,7 @@@ elif ([ $opnfvmodel == "kubernetes" ])
      check_status executing 50
      echo_info "Configuring Kubernetes deployment"
  
 -    ./k8.sh
 +    ./k8.sh $opnfvfeature
  fi
  
  # expose the juju gui-url to login into juju gui