Merge "Change the default mac range to not 0"

Jenkins · openstack-gerrit · commit 0aae5d236b26 · 2012-03-09T19:42:32.000Z
diff --git a/AUTHORS b/AUTHORS
@@ -1,3 +1,4 @@
+Aaron Lee <aaron.lee@rackspace.com>
 Adam Gandelman <adamg@canonical.com>
 Andy Smith <github@anarkystic.com>
 Anthony Young <sleepsonthefloor@gmail.com>
diff --git a/stack.sh b/stack.sh
@@ -179,7 +179,7 @@ M_PORT=${M_PORT:-9898}
 # Default Melange Host
 M_HOST=${M_HOST:-localhost}
 # Melange MAC Address Range
-M_MAC_RANGE=${M_MAC_RANGE:-404040/24}
+M_MAC_RANGE=${M_MAC_RANGE:-FE-EE-DD-00-00-00/24}
 
 # Specify which services to launch.  These generally correspond to screen tabs
 ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,mysql,rabbit}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+Aaron Lee <aaron.lee@rackspace.com>`
`1`	`2`	`Adam Gandelman <adamg@canonical.com>`
`2`	`3`	`Andy Smith <github@anarkystic.com>`
`3`	`4`	`Anthony Young <sleepsonthefloor@gmail.com>`