openstack/devstack
Code Issues Proposed changes

Merge "Allow to install os-ken from git repo"

Browse Source
This commit is contained in:
Zuul
2021-03-18 12:45:10 +00:00
committed by Gerrit Code Review
parent e049a31970 f548ce4816
commit 195c885cb3
3 changed files with 10 additions and 1 deletions
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 {
_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 {

5
stackrc
View File

@@ -555,6 +555,11 @@ GITREPO["ovsdbapp"]=${OVSDBAPP_REPO:-${GIT_BASE}/openstack/ovsdbapp.git}
GITBRANCH["ovsdbapp"]=${OVSDBAPP_BRANCH:-$TARGET_BRANCH}
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

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+=" keystoneauth ironic-lib neutron-lib oslo.privsep"
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
# echo ${!GITREPO[@]}