diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample index aa05a8d5..535b5950 100644 --- a/devstack/local.conf.sample +++ b/devstack/local.conf.sample @@ -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 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 9fcab3e0..da7d5eb7 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -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 diff --git a/devstack/settings b/devstack/settings index 50011260..ac48f2db 100644 --- a/devstack/settings +++ b/devstack/settings @@ -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