diff options
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index ab3e5e34..3bbddb6f 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -9,7 +9,7 @@ source common/tools.sh opnfvsdn=nosdn opnfvtype=noha -openstack=pike +openstack=queens opnfvlab=default opnfvlabfile= opnfvrel=e @@ -21,9 +21,9 @@ virtinstall=0 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>] @@ -90,7 +90,7 @@ for argument in $options -d|--distro ) if ([ "arguments[index]" != "" ]); then - opnfdistro=${arguments[index]} + opnfvdistro=${arguments[index]} fi; ;; @@ -261,9 +261,10 @@ deploy() { 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 @@ -320,18 +321,6 @@ python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, i # Configuring deployment if ([ $opnfvmodel == "openstack" ]); then - if ([ $opnfvsdn == "ocl" ]); then - echo_info "Patching OpenContrail controller container" - 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" @@ -340,11 +329,23 @@ if ([ $opnfvmodel == "openstack" ]); then # creating heat domain after pushing the public API into /etc/hosts 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 + 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 sudo ../juju/get-cloud-images || true |