diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-19 07:22:26 -0500 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-10-19 07:58:51 -0500 |
| commit | 9510c5939f4a30b79d6104ea5b05af42a1ea446a (patch) | |
| tree | b4625282cc988168af1eb73eaca5ab2777e5b870 | |
| parent | c47f8b6275db5fe659aad4967ea024ac6e7b4146 (diff) | |
fixing creation of the network.
Change-Id: Id46aa07dce661dc309ccbc73d4afa62e94657b9b
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
| -rwxr-xr-x | ci/openstack.sh | 23 | ||||
| -rwxr-xr-x | juju/joid-configure-openstack | 15 |
2 files changed, 22 insertions, 16 deletions
diff --git a/ci/openstack.sh b/ci/openstack.sh index 80b6b3da..476533fa 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -227,16 +227,27 @@ if [ "onos" == "$opnfvsdn" ]; then #update_gw_mac elif [ "nosdn" == "$opnfvsdn" ]; then neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ - --router:external=True \ - --provider:network_type flat \ - --provider:physical_network physnet1 + --router:external=True \ + --provider:network_type flat \ + --provider:physical_network phynet1 neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \ --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET -else - neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net --router:external=True \ - --provider:physical_network physnet1 + +elif [ "odl" == "$opnfvsdn" ]; then + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type vxlan + + neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \ + --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ + --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET + else + neutron net-show ext-net > /dev/null 2>&1 || neutron net-create ext-net \ + --router:external=True \ + --provider:network_type flat \ + --provider:physical_network phynet1 neutron subnet-show ext-subnet > /dev/null 2>&1 || neutron subnet-create ext-net \ --name ext-subnet --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ diff --git a/juju/joid-configure-openstack b/juju/joid-configure-openstack index 6c872521..34661281 100755 --- a/juju/joid-configure-openstack +++ b/juju/joid-configure-openstack @@ -68,17 +68,12 @@ echo "Modifying the flavors to be better sized for the Orange Box" #Modify the flavours to fit better on the OB #nova flavor-create FLAVOR_NAME FLAVOR_ID RAM_IN_MB ROOT_DISK_IN_GB NUMBER_OF_VCPUS -openstack flavor delete m1.tiny > /dev/null 2>&1 -openstack flavor delete m1.small > /dev/null 2>&1 -openstack flavor delete m1.medium > /dev/null 2>&1 -openstack flavor delete m1.large > /dev/null 2>&1 -openstack flavor delete m1.xlarge > /dev/null 2>&1 -openstack flavor create --ram 512 --disk 5 --vcpus 1 --public m1.tiny > /dev/null 2>&1 -openstack flavor create --ram 1024 --disk 10 --vcpus 1 --public m1.small > /dev/null 2>&1 -openstack flavor create --ram 2048 --disk 10 --vcpus 2 --public m1.medium > /dev/null 2>&1 -openstack flavor create --ram 3072 --disk 10 --vcpus 2 --public m1.large > /dev/null 2>&1 +openstack flavor show m1.tiny > /dev/null 2>&1 || openstack flavor create --ram 512 --disk 5 --vcpus 1 --public m1.tiny > /dev/null 2>&1 +openstack flavor show m1.small > /dev/null 2>&1 || openstack flavor create --ram 1024 --disk 10 --vcpus 1 --public m1.small > /dev/null 2>&1 +openstack flavor show m1.medium > /dev/null 2>&1 || openstack flavor create --ram 2048 --disk 10 --vcpus 2 --public m1.medium > /dev/null 2>&1 +openstack flavor show m1.large > /dev/null 2>&1 || openstack flavor create --ram 3072 --disk 10 --vcpus 2 --public m1.large > /dev/null 2>&1 # need extra for windows image (15g) -openstack flavor create --ram 8096 --disk 30 --vcpus 4 --public m1.xlarge > /dev/null 2>&1 +openstack flavor show m1.xlarge > /dev/null 2>&1 || openstack flavor create --ram 8096 --disk 30 --vcpus 4 --public m1.xlarge > /dev/null 2>&1 echo "modifying default quotas for admin user" |