From 50495b0163e731f2fd5fe2d43aed10c8c2fe8e1e Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Tue, 30 Sep 2014 09:53:34 -0700
Subject: [PATCH] Install dib from pip

diskimage-builder makes releases to PyPI and is not part of the
integrated release. Since it's not, we don't need to consume its
master branch - rather, we can consume its releases.

Change-Id: If9297a28604612140c39dfe44e77107d1372f0bb
---
 lib/dib | 5 +----
 stackrc | 4 ----
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/dib b/lib/dib
index 3a1167f833..d39d8016c5 100644
--- a/lib/dib
+++ b/lib/dib
@@ -32,10 +32,7 @@ OAC_DIR=$DEST/os-apply-config
 
 # install_dib() - Collect source and prepare
 function install_dib {
-    git_clone $DIB_REPO $DIB_DIR $DIB_BRANCH
-    pushd $DIB_DIR
-    pip_install ./
-    popd
+    pip_install diskimage-builder
 
     git_clone $TIE_REPO $TIE_DIR $TIE_BRANCH
     git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH
diff --git a/stackrc b/stackrc
index 580fabf9f7..10feabe4ba 100644
--- a/stackrc
+++ b/stackrc
@@ -136,10 +136,6 @@ CINDER_BRANCH=${CINDER_BRANCH:-master}
 CINDERCLIENT_REPO=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git}
 CINDERCLIENT_BRANCH=${CINDERCLIENT_BRANCH:-master}
 
-# diskimage-builder
-DIB_REPO=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
-DIB_BRANCH=${DIB_BRANCH:-master}
-
 # image catalog service
 GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
 GLANCE_BRANCH=${GLANCE_BRANCH:-master}