Browse code

Support installing ironic-lib

ironic-lib will soon become a dependency of ironic, make sure we can
write dsvm gates against it.

Change-Id: I6e66ae770cf5065980848e7e987bfd75765a5ac6

Dmitry Tantsur authored on 2015/08/13 20:36:23
Showing 3 changed files
... ...
@@ -31,6 +31,7 @@ set +o pipefail
31 31
 
32 32
 # Set up default directories
33 33
 GITDIR["python-ironicclient"]=$DEST/python-ironicclient
34
+GITDIR["ironic-lib"]=$DEST/ironic-lib
34 35
 
35 36
 IRONIC_DIR=$DEST/ironic
36 37
 IRONIC_PYTHON_AGENT_DIR=$DEST/ironic-python-agent
... ...
@@ -191,6 +192,12 @@ function install_ironic {
191 191
             die $LINENO "$srv should be enabled for Ironic."
192 192
         fi
193 193
     done
194
+
195
+    if use_library_from_git "ironic-lib"; then
196
+        git_clone_by_name "ironic-lib"
197
+        setup_dev_lib "ironic-lib"
198
+    fi
199
+
194 200
     git_clone $IRONIC_REPO $IRONIC_DIR $IRONIC_BRANCH
195 201
     setup_develop $IRONIC_DIR
196 202
 
... ...
@@ -455,6 +455,10 @@ GITBRANCH["ceilometermiddleware"]=${CEILOMETERMIDDLEWARE_BRANCH:-master}
455 455
 GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git}
456 456
 GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-master}
457 457
 
458
+# ironic common lib
459
+GITREPO["ironic-lib"]=${IRONIC_LIB_REPO:-${GIT_BASE}/openstack/ironic-lib.git}
460
+GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}
461
+
458 462
 
459 463
 ##################
460 464
 #
... ...
@@ -41,7 +41,7 @@ ALL_LIBS+=" python-ceilometerclient oslo.utils python-swiftclient"
41 41
 ALL_LIBS+=" python-neutronclient tooz ceilometermiddleware oslo.policy"
42 42
 ALL_LIBS+=" debtcollector os-brick automaton futurist oslo.service"
43 43
 ALL_LIBS+=" oslo.cache oslo.reports"
44
-ALL_LIBS+=" keystoneauth"
44
+ALL_LIBS+=" keystoneauth ironic-lib"
45 45
 
46 46
 # Generate the above list with
47 47
 # echo ${!GITREPO[@]}