Specify stable/diablo glance version.

Specify stable/diablo in both pip-requires and buildout.cfg.
This should allow unit tests to pass now that glance has
moved on to essex.

Change-Id: I8803c2361b532ecc4e2dace4e67534f732bfa74f

django-openstack/buildout.cfg

@@ -1,7 +1,7 @@
 [buildout]
 parts =
    django
-   launchpad
+   glance-git
    openstack-compute
    openstackx
 develop = .
@@ -28,7 +28,6 @@ eggs =
     httplib2
     python-cloudfiles
     coverage
-    glance
 interpreter = python
 
 
@@ -96,16 +95,12 @@ recipe = zerokspot.recipe.git
 repository = git://github.com/rackspace/python-novaclient.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 fetched from git
+[glance-git]
+recipe = zerokspot.recipe.git
+repository = https://review.openstack.org/p/openstack/glance.git
+branch=stable/diablo
+as_egg = True
 
 
 ## Dependencies fetch from other bzr locations

openstack-dashboard/tools/pip-requires

@@ -17,8 +17,8 @@ xattr
 pep8
 pylint
 coverage
-glance
 
+-e git+https://review.openstack.org/p/openstack/glance.git@stable/diablo#egg=glance
 -e git+https://github.com/openstack/quantum.git#egg=quantum
 -e git+https://github.com/jacobian/openstack.compute.git#egg=openstack
 -e git+https://github.com/cloudbuilders/openstackx.git#egg=openstackx