Merge "Make sure Logdir is created."
diff --git a/AUTHORS b/AUTHORS
index a3a4b6b..5f75837 100644
--- 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/files/keystone.conf b/files/keystone.conf
index 64f0a66..5e5bfeb 100644
--- a/files/keystone.conf
+++ b/files/keystone.conf
@@ -35,7 +35,7 @@
driver = keystone.token.backends.kvs.Token
[policy]
-driver = keystone.policy.backends.simple.SimpleMatch
+driver = keystone.policy.backends.rules.Policy
[ec2]
driver = keystone.contrib.ec2.backends.sql.Ec2
diff --git a/stack.sh b/stack.sh
index 1562886..8fdb679 100755
--- a/stack.sh
+++ b/stack.sh
@@ -179,7 +179,7 @@
# 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}