commit 8cca34768ab60605944fb099350ea08366aa9158
author Andy Bavier <acb@cs.princeton.edu> Wed Apr 15 16:55:38 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Wed Apr 15 16:55:38 2015 -0400
tree b2fe41468dffd2552517a0f4eddd85b7be4f64d2
parent edbc6fee6aa550911f89692a217c9622b7a9bbc5

Bug fixes

scripts/network-setup.sh

diff --git a/scripts/network-setup.sh b/scripts/network-setup.sh
index efa35fc..6bacaa5 100755
--- a/scripts/network-setup.sh
+++ b/scripts/network-setup.sh
@@ -1,23 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
-source ~/admin_openrc.sh
+source ~/admin-openrc.sh
 
 # Create nat-net network
-neutron net-show nat-net 2&>1 > /dev/null
+neutron net-show nat-net 2>&1 > /dev/null
 if [ "$?" -ne 0 ]
 then
     neutron net-create --provider:physical_network=nat --provider:network_type=flat --shared nat-net
 fi
 
 # Create nat-net subnet
-neutron subnet-show nat-net 2&>1 > /dev/null
+neutron subnet-show nat-net 2>&1 > /dev/null
 if [ "$?" -ne 0 ]
 then
     neutron subnet-create nat-net --name nat-net 172.16.0.0/16 --gateway=172.16.0.1 --enable-dhcp=false
 fi
 
 # Create nat-net network
-neutron net-show ext-net 2&>1 > /dev/null
+neutron net-show ext-net 2>&1 > /dev/null
 if [ "$?" -ne 0 ]
 then
     neutron net-create --provider:physical_network=ext --provider:network_type=flat --shared ext-net