summaryrefslogtreecommitdiffstats
path: root/ci/deploy.sh
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-10-18 19:56:15 -0400
committerGuo Ruijing <ruijing.guo@intel.com>2017-10-18 20:02:51 -0400
commit2819ba063c1a9896ccf437f85ca4c2ee463d7e80 (patch)
tree3aa67c5165ed3dc73bcd85cdb836731f4e212f97 /ci/deploy.sh
parent470472f807b118b235d7ff473a3e58bfaf8c293d (diff)
cleanup code
1. remove unused code due to juju>2 & maas>2.2 in Ubuntu16.04 2. remove deprecated 03-maasdeploy.sh 3. remove other unused code Change-Id: I20fd0e96400db1262b0df3ef2b502c8001dd5b76 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'ci/deploy.sh')
-rwxr-xr-xci/deploy.sh15
1 files changed, 4 insertions, 11 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 9277e857..a061f0ef 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -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,8 +318,6 @@ 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
echo_info "Configuring OpenStack deployment"
@@ -327,13 +325,8 @@ if ([ $opnfvmodel == "openstack" ]); then
./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