From 1c294077a385b07021ba0f64eece447975a7dbf7 Mon Sep 17 00:00:00 2001
From: Mark Gius <mgius7096@gmail.com>
Date: Thu, 30 Jun 2011 12:02:03 -0700
Subject: [PATCH] Glance now deploys through buildout, and copious comments
 added

---
 django-openstack/buildout.cfg | 83 ++++++++++++++++++++++++++++-------
 1 file changed, 66 insertions(+), 17 deletions(-)

diff --git a/django-openstack/buildout.cfg b/django-openstack/buildout.cfg
index 602f27d5f..ee067df82 100644
--- a/django-openstack/buildout.cfg
+++ b/django-openstack/buildout.cfg
@@ -1,43 +1,83 @@
 [buildout]
 parts = 
    django
-   django-mailer
+   django-openstack
    launchpad
    openstack-compute
    openstackx
-   python
-   python-cloudfiles
 develop = .
-eggs = django-openstack
 versions = versions
 
+
 [versions]
 django = 1.3
+# the following are for glance-dependencies
+eventlet = 0.9.12
+greenlet = 0.3.1
+pep8 = 0.5.0
+sqlalchemy = 0.6.3
+sqlalchemy-migrate = 0.6
+webob = 1.0.8
 
-[python]
+
+[dependencies]
+# dependencies that are found locally ${buildout:directory}/module
+# or can be fetched from pypi
 recipe = zc.recipe.egg
+eggs = 
+    django-mailer
+    python-cloudfiles
 interpreter = python
-eggs = ${buildout:eggs}
+
+
+# glance doesn't have a client, and installing
+# from bzr doesn't install deps
+[glance-dependencies]
+recipe = zc.recipe.egg
+eggs =
+   PasteDeploy
+   anyjson
+   argparse
+   eventlet
+   greenlet
+   paste
+   pep8
+   routes
+   sqlalchemy
+   sqlalchemy-migrate
+   webob
+interpreter = python
+
+
+[django-openstack]
+recipe = zc.recipe.egg
+eggs = django-openstack
+interpreter = python
+
 
 [django]
+# defines settings for django
+# any dependencies that cannot be satisifed via the dependencies
+# recipe above will need to be added to the extra-paths here.
+# IE, dependencies fetch from a git repo will not auto-populate
+# like the zc.recipe.egg ones will
 recipe = djangorecipe
 project = django_openstack
 projectegg = django_openstack
 settings = tests
 test = django_openstack
-eggs = ${buildout:eggs}
+eggs =
+   ${dependencies:eggs}
+   ${django-openstack:eggs}
+   ${glance-dependencies:eggs}
 extra-paths =
     ${buildout:directory}/launchpad/glance
-    ${buildout:directory}/parts/django-mailer
     ${buildout:directory}/parts/openstack-compute
     ${buildout:directory}/parts/openstackx
-    ${buildout:directory}/parts/python-cloudfiles
 
-[django-mailer]
-recipe = zerokspot.recipe.git
-repository = git://github.com/jtauber/django-mailer.git
-as_egg = True
 
+## Dependencies fetch from git
+# git dependencies end up as a subdirectory of ${buildout:directory}/parts/
 [openstack-compute]
 recipe = zerokspot.recipe.git
 repository = git://github.com/jacobian/openstack.compute.git
@@ -48,12 +88,21 @@ recipe = zerokspot.recipe.git
 repository = git://github.com/cloudbuilders/openstackx.git
 as_egg = True
 
-[python-cloudfiles]
-recipe = zerokspot.recipe.git
-repository = git://github.com/rackspace/python-cloudfiles.git
-as_egg = True
 
+## Dependencies fetched from launchpad
+# launchpad dependencies will appear as subfolders of
+# ${buildout:directory}/launchpad/
+# multiple urls can be specified, format is 
+# branch_url subfolder_name
+# don't forget to add directory to extra_paths in [django]
 [launchpad]
 recipe = bazaarrecipe
 urls = 
    https://launchpad.net/~hudson-openstack/glance/trunk/ glance
+
+
+## Dependencies fetch from other bzr locations
+#[bzrdeps]
+#recipe = bazaarrecipe
+#urls = 
+#   https://launchpad.net/~hudson-openstack/glance/trunk/ glance