diff options
Diffstat (limited to 'ci/deploy.sh')
| -rwxr-xr-x | ci/deploy.sh | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index a6a1b182..ab3e5e34 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -9,7 +9,7 @@ source common/tools.sh opnfvsdn=nosdn opnfvtype=noha -openstack=ocata +openstack=pike opnfvlab=default opnfvlabfile= opnfvrel=e @@ -23,7 +23,7 @@ maasinstall=0 usage() { echo "Usage: $0 [-s|--sdn <nosdn|odl|opencontrail>] [-t|--type <noha|ha|tip>] - [-o|--openstack <ocata>] + [-o|--openstack <ocata|pike>] [-l|--lab <default|custom>] [-f|--feature <ipv6,dpdk,lxd,dvr,openbaton,multus>] [-d|--distro <xenial>] @@ -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 @@ deploy() { cp $labfile ./labconfig.yaml fi - ./00-maasdeploy.sh custom + ./03-maasdeploy.sh custom fi fi @@ -318,20 +318,32 @@ juju status --format=tabular # 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 + 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" ./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 ([ $opnftype == "ha" ]); then + status=`juju run-action heat/1 domain-setup` echo $status - else - status=`juju action do heat/0 domain-setup` + status=`juju run-action heat/2 domain-setup` echo $status fi |