From b4e1f6be9a8e32fea4dcd85b6c5349f3acebfca1 Mon Sep 17 00:00:00 2001
From: Liam young <liam.young@canonical.com>
Date: Wed, 6 Nov 2013 14:23:49 +0000
Subject: [PATCH] Fix conflicts with trunk

---
 config.yaml | 13 +++++++------
 revision    |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/config.yaml b/config.yaml
index e046a406..834dc2de 100644
--- a/config.yaml
+++ b/config.yaml
@@ -25,12 +25,6 @@ options:
         - deb http://my.archive.com/ubuntu main|KEYID
       .
       Note that quantum/neutron is only supported >= Folsom.
-  rabbit-user:
-    type: string
-    default: nova
-  rabbit-vhost:
-    type: string
-    default: nova
   run_internal_router:
     type: string
     default: all
@@ -48,3 +42,10 @@ options:
       Optional configuration to set the external_network_id. Only needed when
       configuring multiple external networks and should be used in conjunction
       with run_internal_router.
+  rabbit-user:
+    type: string
+    default: neutron
+  rabbit-vhost:
+    type: string
+    default: openstack
+
diff --git a/revision b/revision
index 1479e19b..e1617e84 100644
--- a/revision
+++ b/revision
@@ -1 +1 @@
-65
+57