summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-06 23:28:21 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-07 14:33:54 +0000
commit38a33907ad0ba3aa00bdbb4574d3934d7f0068fa (patch)
treec5039ef2486065295e6dddc7d31fe9fb18b32f83
parent5ac39a0e6c542ac2857d4d877c0df02598cf9b4f (diff)
modified to use mitaka by default rather than Liberty.
This patch to modify the default deployment to mitaka. Ans also disable the creation of external network as now joid deploy.sh will create the external network itself based on labconfig.yaml Change-Id: I282eaa803af47f04348532ffd1a7a5990d50d380 signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
-rw-r--r--jjb/joid/joid-deploy.sh23
-rw-r--r--jjb/opnfv/installer-params.yml4
2 files changed, 2 insertions, 25 deletions
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 51a1469c4..bd2597320 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -223,29 +223,6 @@ curl -i -sw '%{http_code}' -H "Content-Type: application/json" -d "
}" http://$KEYSTONE:5000/v3/auth/tokens |grep "HTTP/1.1 20" 2>&1 >/dev/null;
exit_on_error $? "Deploy FAILED to auth to openstack"
-
-##
-## Create external network if needed
-##
-
-# If we have more information than only the name, try to create it
-if [ -z "$EXTNET_TYPE" ]; then
- echo "------ No data for external network creation, pass ------"
-elif [[ "$DEPLOY_SCENARIO" =~ "onos" ]]; then
- echo "------ ONOS have created the external network, pass ------"
-else
- echo "------ External network creation ------"
- neutron net-create $EXTNET_NAME --router:external True \
- --provider:physical_network external --provider:network_type $EXTNET_TYPE
- exit_on_error $? "External network creation failed"
- neutron subnet-create $EXTNET_NAME --name $EXTNET_NAME \
- --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \
- --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET
- exit_on_error $? "External subnet creation failed"
- neutron net-update $EXTNET_NAME --shared
- exit_on_error $? "External network sharing failed"
-fi
-
##
## Exit success
##
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml
index c0223e235..98a15de79 100644
--- a/jjb/opnfv/installer-params.yml
+++ b/jjb/opnfv/installer-params.yml
@@ -63,8 +63,8 @@
description: 'Installer used for deploying OPNFV on this POD'
- string:
name: OS_RELEASE
- default: 'liberty'
- description: 'OpenStack release (kilo|liberty)'
+ default: 'mitaka'
+ description: 'OpenStack release (liberty|mitaka)'
- string:
name: EXTERNAL_NETWORK
default: ext-net;flat;192.168.0.2;192.168.0.253;192.168.0.1;192.168.0.0/24