diff options
| -rwxr-xr-x | ci/deploy.sh | 8 | ||||
| -rwxr-xr-x | ci/openstack.sh | 12 |
2 files changed, 11 insertions, 9 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh index 9d0c0286..a374d394 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -163,12 +163,6 @@ fi check_status echo "...... deployment finished ......." -if [ "$opnfvsdn" == "onos" ]; then - ./openstack.sh "$opnfvsdn" - check_status -else - #create the basic data for verification of stack. - ./openstack.sh -fi +./openstack.sh "$opnfvsdn" echo "...... finished ......." diff --git a/ci/openstack.sh b/ci/openstack.sh index 1b36aabe..2da729f6 100755 --- a/ci/openstack.sh +++ b/ci/openstack.sh @@ -106,14 +106,22 @@ if [ "onos" == "$1" ]; then neutron net-create ext-net --shared --router:external=True neutron subnet-create ext-net --name ext-subnet $EXTNET_NET update_gw_mac +elif [ "nosdn" == "$1" ]; then + neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat + neutron subnet-create ext-net --name ext-subnet \ + --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ + --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET + # configure security groups + neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default + neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default else neutron net-create ext-net --shared --router:external --provider:physical_network external --provider:network_type flat neutron subnet-create ext-net --name ext-subnet \ --allocation-pool start=$EXTNET_FIP,end=$EXTNET_LIP \ --disable-dhcp --gateway $EXTNET_GW $EXTNET_NET # configure security groups -# neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default -# neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default + #neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol icmp --remote-ip-prefix 0.0.0.0/0 default + #neutron security-group-rule-create --direction ingress --ethertype IPv4 --protocol tcp --port-range-min 22 --port-range-max 22 --remote-ip-prefix 0.0.0.0/0 default fi |