openstack/devstack
Code Issues Proposed changes

Allow to install os-ken from git repo

Browse Source 
os-ken is used by neutron ML2/OVS agent.
We need to install os-ken from source to test os-ken changes
against neutron. We already have tempest-integrated-networking job
in os-ken repo but it turns out it consumes os-ken from PyPI :-(

Change-Id: Ibcff212591e9fed25f1316403627269d81455b09
This commit is contained in:
Akihiro Motoki 2021-03-04 10:31:30 +09:00
parent 0de8a5534f
commit f548ce4816
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron_plugins/openvswitch_agent
View File

@ -15,6 +15,10 @@ function neutron_plugin_create_nova_conf {
function neutron_plugin_install_agent_packages { function neutron_plugin_install_agent_packages {
_neutron_ovs_base_install_agent_packages _neutron_ovs_base_install_agent_packages
if use_library_from_git "os-ken"; then
git_clone_by_name "os-ken"
setup_dev_lib "os-ken"
fi
} }
function neutron_plugin_configure_dhcp_agent { function neutron_plugin_configure_dhcp_agent {

5
stackrc
View File

@ -554,6 +554,11 @@ GITREPO["ovsdbapp"]=${OVSDBAPP_REPO:-${GIT_BASE}/openstack/ovsdbapp.git}
GITBRANCH["ovsdbapp"]=${OVSDBAPP_BRANCH:-$TARGET_BRANCH} GITBRANCH["ovsdbapp"]=${OVSDBAPP_BRANCH:-$TARGET_BRANCH}
GITDIR["ovsdbapp"]=$DEST/ovsdbapp GITDIR["ovsdbapp"]=$DEST/ovsdbapp
# os-ken used by neutron
GITREPO["os-ken"]=${OS_KEN_REPO:-${GIT_BASE}/openstack/os-ken.git}
GITBRANCH["os-ken"]=${OS_KEN_BRANCH:-$TARGET_BRANCH}
GITDIR["os-ken"]=$DEST/os-ken
################## ##################
# #
# TripleO / Heat Agent Components # TripleO / Heat Agent Components

2
tests/test_libs_from_pypi.sh
View File

@ -44,7 +44,7 @@ ALL_LIBS+=" debtcollector os-brick os-traits automaton futurist oslo.service"
ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive" ALL_LIBS+=" oslo.cache oslo.reports osprofiler cursive"
ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep" ALL_LIBS+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext" ALL_LIBS+=" diskimage-builder os-vif python-brick-cinderclient-ext"
ALL_LIBS+=" castellan python-barbicanclient ovsdbapp" ALL_LIBS+=" castellan python-barbicanclient ovsdbapp os-ken"
# Generate the above list with # Generate the above list with
# echo ${!GITREPO[@]} # echo ${!GITREPO[@]}