Browse Source

Devstack: Install six via pip

There's no python3-six pkg on centos7. It is better to use pip
to install six.

Note that six -- a required python package for building ovs -- was
already being installed in gate_hook.sh. This change moves that
install closer to where it is used: _compile_ovs

Would prefer to use pip_install wrapper, but that is not useable
right now because REQUIREMENTS_DIR variable is being explicitly
set in starckrc:
63ab664baf/stackrc (L242-L243)

Related change: https://review.opendev.org/#/c/685122/

Co-Authored-By: Lucas Alvares Gomes <lucasagomes@gmail.com>
Change-Id: Iadbf7bbab8b7ffd646e5bcb8235fa3f1f890271c
tags/neutron-merge
Flavio Fernandes 2 months ago
parent
commit
6efae0f722
2 changed files with 7 additions and 8 deletions
  1. +7
    -3
      devstack/lib/ovn
  2. +0
    -5
      networking_ovn/tests/contrib/gate_hook.sh

+ 7
- 3
devstack/lib/ovn View File

@@ -108,6 +108,13 @@ function _reload_ovs_kernel_modules {
function _compile_ovs {
local build_modules=$1

# Install the dependencies
install_package autoconf automake libtool gcc patch make
# TODO(flaviof): Would prefer to use pip_install wrapper, but that is not
# useable right now because REQUIREMENTS_DIR variable is hard coded in
# starckrc
sudo pip3 install six

_prepare_for_ovs_compilation $build_modules

pushd $DEST/$OVS_REPO_NAME
@@ -146,9 +153,6 @@ function compile_ovn {
local prefix=$2
local localstatedir=$3

# Install the dependencies
install_package autoconf automake libtool gcc patch make python3-six

# First, compile OVS
_compile_ovs $build_modules


+ 0
- 5
networking_ovn/tests/contrib/gate_hook.sh View File

@@ -19,11 +19,6 @@ case $VENV in
source $NEUTRON_PATH/devstack/lib/ovs
source $NETWORKING_OVN_PATH/devstack/lib/ovn

# NOTE(numans) Functional tests after upgrade to xenial in
# the CI are breaking because of missing six package.
# Installing the package for now as a workaround
# https://bugs.launchpad.net/networking-ovn/+bug/1648670
sudo pip install six
# Install SSL dependencies here for now as a workaround
# https://bugs.launchpad.net/networking-ovn/+bug/1696713
if is_fedora ; then

Loading…
Cancel
Save