opnfvsdn=nosdn
opnfvtype=noha
-openstack=ocata
+openstack=queens
opnfvlab=default
opnfvlabfile=
opnfvrel=e
maasinstall=0
usage() { echo "Usage: $0
- [-s|--sdn <nosdn|odl|opencontrail>]
+ [-s|--sdn <nosdn|odl|ocl>]
[-t|--type <noha|ha|tip>]
- [-o|--openstack <ocata>]
+ [-o|--openstack <ocata|queens>]
[-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>]
-d|--distro )
if ([ "arguments[index]" != "" ]); then
- opnfdistro=${arguments[index]}
+ opnfvdistro=${arguments[index]}
fi;
;;
./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
cp $labfile ./labconfig.yaml
fi
- ./00-maasdeploy.sh custom
+ ./03-maasdeploy.sh custom
fi
fi
fi
#bootstrap the node
- ./01-bootstrap.sh
+ ./01-bootstrap.sh $opnfvdistro
juju model-config default-series=$opnfvdistro enable-os-refresh-update=false enable-os-upgrade=false
+ juju set-model-constraints tags=
# case default deploy the opnfv platform:
./02-deploybundle.sh $opnfvtype $openstack $opnfvlab $opnfvsdn $opnfvfeature $opnfvdistro $opnfvmodel
# 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"
./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`
+ status=`juju run-action heat/0 domain-setup`
+ echo $status
+ if ([ $opnfvsdn != "ocl" ]) then
+ status=`juju run-action ceilometer/0 ceilometer-upgrade`
+ fi
+ echo $status
+ if ([ $opnftype == "ha" ]); then
+ status=`juju run-action heat/1 domain-setup`
echo $status
- else
- status=`juju action do heat/0 domain-setup`
+ if ([ $opnfvsdn != "ocl" ]) then
+ status=`juju run-action ceilometer/1 ceilometer-upgrade`
+ fi
+ echo $status
+ status=`juju run-action heat/2 domain-setup`
+ echo $status
+ if ([ $opnfvsdn != "ocl" ]) then
+ status=`juju run-action ceilometer/2 ceilometer-upgrade`
+ fi
echo $status
fi
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