openstack
/
kuryr-libnetwork
Code Issues Proposed changes

use kuryr-lib master code by default in kuryr-libnetwork vagrant 

Currently, devstack will install kuryr-lib 0.1.0 for
kuryr-libnetwork. But we still need to check if kuryr-libnetwork
can work with kuryr-lib master code. This patch introduce
LIBS_FROM_GIT to let devstack install latest kuryr-lib code.
And let kuryr-libnetwork use kuryr-lib master code by default
in vagrant.

Change-Id: Id05dab5bd6a4aa2efe5f6991e9fd5fc38c1cf91b
Partially-implements: bp cross-project-ci
Closes-bug: #1630971
This commit is contained in:
Liping Mao 2016-10-06 19:53:38 +08:00
parent 9dd929d006
commit 68edfeacdc
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/local.conf.sample
View File

@ -9,6 +9,10 @@ SERVICE_PASSWORD=pass
SERVICE_TOKEN=pass
ADMIN_PASSWORD=pass
# Install kuryr git master source code by default.
# If you want to use stable kuryr lib, please comment out this line.
LIBS_FROM_GIT=kuryr
enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
# Use Neutron instead of nova-network

11
devstack/plugin.sh
View File

@ -82,6 +82,17 @@ function configure_kuryr {
if is_service_enabled kuryr-libnetwork; then
DISTRO_DISTUTILS_DATA_PATH=$(python -c "import distutils.dist;import distutils.command.install;inst = distutils.command.install.install(distutils.dist.Distribution());inst.finalize_options();print inst.install_data")
if [[ "$1" == "stack" && "$2" == "install" ]]; then
# Install kuryr-lib from git so we make sure we're testing
# the latest code.
if use_library_from_git "kuryr"; then
git_clone_by_name "kuryr"
setup_dev_lib "kuryr"
# Install bind scripts
if [ ! -d "${DISTRO_DISTUTILS_DATA_PATH}/libexec/kuryr" ]; then
sudo mkdir -p ${DISTRO_DISTUTILS_DATA_PATH}/libexec/kuryr
fi
sudo cp -rf ${DEST}/kuryr/usr/libexec/kuryr/* ${DISTRO_DISTUTILS_DATA_PATH}/libexec/kuryr
fi
install_etcd_data_store
setup_develop $KURYR_HOME

4
devstack/settings
View File

@ -21,4 +21,8 @@ KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-2375}
KURYR_DOCKER_ENGINE_SOCKET_FILE=${KURYR_DOCKER_ENGINE_SOCKET_FILE:-/var/run/docker.sock}
KURYR_ETCD_PORT=${KURYR_ETCD_PORT:-4001}
GITREPO["kuryr"]=${KURYR_REPO:-${GIT_BASE}/openstack/kuryr.git}
GITBRANCH["kuryr"]=${KURYR_BRANCH:-master}
GITDIR["kuryr"]=$DEST/kuryr
enable_service kuryr-libnetwork etcd-server docker-engine