From f7deb187e3cd333c12db92d071e61f7d4af31b84 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Mon, 12 Mar 2012 12:56:59 -0700
Subject: [PATCH] updated to sync again with devstack v1, fixes issue #75, for
 now

---
 conf/pips/horizon.json                            | 3 +++
 conf/pkgs/horizon.json                            | 4 ----
 conf/stack.ini                                    | 2 +-
 conf/templates/keystone/default_catalog.templates | 6 ++++++
 devstack/libvirt.py                               | 3 +--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/conf/pips/horizon.json b/conf/pips/horizon.json
index 7ecf49e7..428873b8 100644
--- a/conf/pips/horizon.json
+++ b/conf/pips/horizon.json
@@ -7,6 +7,9 @@
         },
         "pycrypto": {
             "version": "2.3"
+        },
+        "python-cloudfiles": {
+            "version": "1.7.9.3"
         }
     },
     "rhel-6": {
diff --git a/conf/pkgs/horizon.json b/conf/pkgs/horizon.json
index e0158da6..7aedd717 100644
--- a/conf/pkgs/horizon.json
+++ b/conf/pkgs/horizon.json
@@ -84,10 +84,6 @@
             "version": "0.7*",
             "removable": true
         },
-        "python-cloudfiles": {
-            "version": "1.7.9*",
-            "removable": true
-        },
         "python-migrate": {
             "version": "0.7*",
             "removable": true
diff --git a/conf/stack.ini b/conf/stack.ini
index ac34ff41..9403fc79 100644
--- a/conf/stack.ini
+++ b/conf/stack.ini
@@ -246,7 +246,7 @@ m_port = ${M_PORT:-9898}
 m_host = ${M_HOST:-$(host:ip)}
 
 # 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}
 
 [quantum]
 
diff --git a/conf/templates/keystone/default_catalog.templates b/conf/templates/keystone/default_catalog.templates
index dbf51349..54a61c2f 100644
--- a/conf/templates/keystone/default_catalog.templates
+++ b/conf/templates/keystone/default_catalog.templates
@@ -26,6 +26,12 @@ catalog.RegionOne.ec2.internalURL = http://%SERVICE_HOST%:8773/services/Cloud
 catalog.RegionOne.ec2.name = 'EC2 Service'
 
 
+catalog.RegionOne.s3.publicURL = http://%SERVICE_HOST%:3333
+catalog.RegionOne.s3.adminURL = http://%SERVICE_HOST%:3333
+catalog.RegionOne.s3.internalURL = http://%SERVICE_HOST%:3333
+catalog.RegionOne.s3.name = 'S3 Service'
+
+
 catalog.RegionOne.image.publicURL = http://%SERVICE_HOST%:9292/v1
 catalog.RegionOne.image.adminURL = http://%SERVICE_HOST%:9292/v1
 catalog.RegionOne.image.internalURL = http://%SERVICE_HOST%:9292/v1
diff --git a/devstack/libvirt.py b/devstack/libvirt.py
index 14537834..6215d9b5 100644
--- a/devstack/libvirt.py
+++ b/devstack/libvirt.py
@@ -32,8 +32,7 @@ LIBVIRT_PROTOCOL_MAP = {
     'uml': 'uml:///system',
     'lxc': 'lxc:///',
 }
-VIRT_TYPE = 'libvirt'
-VIRT_LIB = VIRT_TYPE
+VIRT_LIB = 'libvirt'
 
 #distros name the libvirt service differently :-(
 SV_NAME_MAP = {