opnfvsdn=nosdn
opnfvtype=noha
-openstack=pike
+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|pike>]
+ [-o|--openstack <ocata|queens>]
[-l|--lab <default|custom>]
[-f|--feature <ipv6,dpdk,lxd,dvr,openbaton,multus>]
[-d|--distro <xenial>]
if ([ $opnfvmodel == "openstack" ]); then
if ([ $opnfvsdn == "ocl" ]); then
echo_info "Patching OpenContrail controller container"
- juju ssh contrail-controller/0 sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp
- juju ssh contrail-controller/0 cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2
- juju ssh contrail-controller/0 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2'
- juju ssh contrail-controller/0 sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini
- juju ssh contrail-controller/0 sudo docker exec -it contrail-controller service contrail-api restart
-
- juju ssh contrail-controller/0 sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini
+ juju run --application contrail-controller sudo docker cp contrail-controller:/etc/contrail/vnc_api_lib.ini /tmp
+ juju run --application contrail-controller cp /tmp/vnc_api_lib.ini /tmp/vnc_api_lib.ini2
+ juju run --application contrail-controller 'echo "AUTHN_DOMAIN = admin_domain" >> /tmp/vnc_api_lib.ini2'
+ juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-controller:/etc/contrail/vnc_api_lib.ini
+ juju run --application contrail-controller sudo docker exec contrail-controller service contrail-api restart
+
+ juju run --application contrail-controller sudo docker cp /tmp/vnc_api_lib.ini2 contrail-analytics:/etc/contrail/vnc_api_lib.ini
+ echo_info "Wait for OpenContrail components to stabilize"
+ sleep 600
fi
echo_info "Configuring OpenStack deployment"
# creating heat domain after pushing the public API into /etc/hosts
status=`juju run-action heat/0 domain-setup`
echo $status
+ status=`juju run-action ceilometer/0 ceilometer-upgrade`
+ echo $status
if ([ $opnftype == "ha" ]); then
status=`juju run-action heat/1 domain-setup`
echo $status
+ status=`juju run-action ceilometer/1 ceilometer-upgrade`
+ echo $status
status=`juju run-action heat/2 domain-setup`
echo $status
+ status=`juju run-action ceilometer/2 ceilometer-upgrade`
+ echo $status
fi
sudo ../juju/get-cloud-images || true