From df8418dee2a02dc6414dd2b224af92e2681e1390 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Sat, 4 Feb 2012 21:57:56 -0800
Subject: [PATCH] Added melange pkgs.

---
 conf/pkgs/melange.json         | 44 ++++++++++++++++++++++++++++++++++
 devstack/components/melange.py |  2 +-
 devstack/progs/actions.py      | 10 +++++---
 devstack/settings.py           |  2 +-
 4 files changed, 53 insertions(+), 5 deletions(-)
 create mode 100644 conf/pkgs/melange.json

diff --git a/conf/pkgs/melange.json b/conf/pkgs/melange.json
new file mode 100644
index 00000000..a2302923
--- /dev/null
+++ b/conf/pkgs/melange.json
@@ -0,0 +1,44 @@
+# This is a extended json package definition file 
+# We allow simple comments (lines starting with a hash symbol)
+{
+    # This is currently our "master" repo set with versions
+    # that we are trying to align other distributions with.
+    # The versions should at least be major + minor!
+    "ubuntu-oneiric": {
+        "python-eventlet": {
+            "version": "0.9*",
+            "removable": true
+        },
+        "python-greenlet": {
+            "version": "0.3.1*",
+            "removable": true
+        },
+        "python-paste": {
+            "version": "1.7.5*",
+            "removable": true
+        },
+        "python-pastedeploy": {
+            "version": "1.5*",
+            "removable": true
+        },
+        "python-webob": {
+            "version": "1.0*",
+            "removable": true
+        },
+        "python-routes": {
+            "version": "1.12*",
+            "removable": true
+        },
+        "python-sqlalchemy": {
+            "version": "0.6*",
+            "removable": true
+        },
+        "python-mysqldb": {
+            "version": "1.2*",
+            "removable": true
+        }
+    },
+    "rhel-6": {
+        # TBD
+    }
+}
diff --git a/devstack/components/melange.py b/devstack/components/melange.py
index 714cb267..c808e0d4 100644
--- a/devstack/components/melange.py
+++ b/devstack/components/melange.py
@@ -32,7 +32,7 @@ LOG = logging.getLogger("devstack.components.melange")
 TYPE = settings.MELANGE
 
 #the pkg json files melange requires for installation
-REQ_PKGS = ['general.json']
+REQ_PKGS = ['general.json', 'melange.json']
 
 #this db will be dropped then created
 DB_NAME = 'melange'
diff --git a/devstack/progs/actions.py b/devstack/progs/actions.py
index 6fe991c9..c4baa8f5 100644
--- a/devstack/progs/actions.py
+++ b/devstack/progs/actions.py
@@ -281,7 +281,7 @@ def _run_components(action_name, component_order, components, distro, root_dir,
     #run anything before it gets going...
     _pre_run(action_name, root_dir=root_dir, pkg=pkg_manager, cfg=config)
 
-    LOG.info("Warming up your instance configurations (ie so you won't be prompted later)")
+    LOG.info("Warming up your component configurations (ie so you won't be prompted later)")
     for component in component_order:
         base_inst = all_instances.get(component)
         if base_inst:
@@ -289,9 +289,13 @@ def _run_components(action_name, component_order, components, distro, root_dir,
         pre_inst = prerequisite_instances.get(component)
         if pre_inst:
             pre_inst.warm_configs()
-    LOG.info("Your instance configurations should now be nice and warm!")
+    LOG.info("Your component configurations should now be nice and warm!")
 
-    LOG.info("Activating instances required to complete action %s." % (action_name))
+    c_str = 'components'
+    if len(component_order) == 1:
+        c_str = 'component'
+
+    LOG.info("Activating %s required to complete action %s." % (c_str, action_name))
 
     results = list()
     force = program_args.get('force', False)
diff --git a/devstack/settings.py b/devstack/settings.py
index c6328cc2..a4aa8dba 100644
--- a/devstack/settings.py
+++ b/devstack/settings.py
@@ -83,7 +83,7 @@ COMPONENT_DEPENDENCIES = {
     QUANTUM: [DB, QUANTUM_CLIENT],
     NOVNC: [NOVA],
     QUANTUM_CLIENT: [],
-    MELANGE: [],
+    MELANGE: [DB],
     MELANGE_CLIENT: [],
 }