Browse code

Merge "Install dib from pip"

Jenkins authored on 2014/10/03 03:28:57
Showing 2 changed files
... ...
@@ -32,10 +32,7 @@ OAC_DIR=$DEST/os-apply-config
32 32
 
33 33
 # install_dib() - Collect source and prepare
34 34
 function install_dib {
35
-    git_clone $DIB_REPO $DIB_DIR $DIB_BRANCH
36
-    pushd $DIB_DIR
37
-    pip_install ./
38
-    popd
35
+    pip_install diskimage-builder
39 36
 
40 37
     git_clone $TIE_REPO $TIE_DIR $TIE_BRANCH
41 38
     git_clone $OCC_REPO $OCC_DIR $OCC_BRANCH
... ...
@@ -136,10 +136,6 @@ CINDER_BRANCH=${CINDER_BRANCH:-master}
136 136
 CINDERCLIENT_REPO=${CINDERCLIENT_REPO:-${GIT_BASE}/openstack/python-cinderclient.git}
137 137
 CINDERCLIENT_BRANCH=${CINDERCLIENT_BRANCH:-master}
138 138
 
139
-# diskimage-builder
140
-DIB_REPO=${DIB_REPO:-${GIT_BASE}/openstack/diskimage-builder.git}
141
-DIB_BRANCH=${DIB_BRANCH:-master}
142
-
143 139
 # image catalog service
144 140
 GLANCE_REPO=${GLANCE_REPO:-${GIT_BASE}/openstack/glance.git}
145 141
 GLANCE_BRANCH=${GLANCE_BRANCH:-master}