Browse code

Allow install os-vif library used by Nova

In future Nova will use os-vif library for some communication with Neutron.
This patch add ability to install os-vif library that requires for run
tempest-jobs for new patches, that used os-vif.

Change-Id: I28e48afd3c740b1aa50c994d99f660f095e7deda

Sergey Belous authored on 2016/03/21 18:32:06
Showing 3 changed files
... ...
@@ -34,6 +34,7 @@ set +o xtrace
34 34
 
35 35
 # Set up default directories
36 36
 GITDIR["python-novaclient"]=$DEST/python-novaclient
37
+GITDIR["os-vif"]=$DEST/os-vif
37 38
 NOVA_DIR=$DEST/nova
38 39
 
39 40
 # Nova virtual environment
... ...
@@ -728,6 +729,13 @@ function install_novaclient {
728 728
 
729 729
 # install_nova() - Collect source and prepare
730 730
 function install_nova {
731
+
732
+    # Install os-vif
733
+    if use_library_from_git "os-vif"; then
734
+        git_clone_by_name "os-vif"
735
+        setup_dev_lib "os-vif"
736
+    fi
737
+
731 738
     if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then
732 739
         install_nova_hypervisor
733 740
     fi
... ...
@@ -477,6 +477,10 @@ GITDIR["ceilometermiddleware"]=$DEST/ceilometermiddleware
477 477
 GITREPO["os-brick"]=${OS_BRICK_REPO:-${GIT_BASE}/openstack/os-brick.git}
478 478
 GITBRANCH["os-brick"]=${OS_BRICK_BRANCH:-master}
479 479
 
480
+# os-vif library to communicate between Neutron to Nova
481
+GITREPO["os-vif"]=${OS_VIF_REPO:-${GIT_BASE}/openstack/os-vif.git}
482
+GITBRANCH["os-vif"]=${OS_VIF_BRANCH:-master}
483
+
480 484
 # ironic common lib
481 485
 GITREPO["ironic-lib"]=${IRONIC_LIB_REPO:-${GIT_BASE}/openstack/ironic-lib.git}
482 486
 GITBRANCH["ironic-lib"]=${IRONIC_LIB_BRANCH:-master}
... ...
@@ -42,7 +42,7 @@ 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 osprofiler"
44 44
 ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
45
-ALL_LIBS+=" diskimage-builder"
45
+ALL_LIBS+=" diskimage-builder os-vif"
46 46
 
47 47
 # Generate the above list with
48 48
 # echo ${!GITREPO[@]}