openstack/kuryr-libnetwork
Code Issues Proposed changes

Activate libnetwork plugin with .spec instead of .json

Browse Source 
Docker 1.11.0 fails to activate libnetwork plugins specified with .json files.
Using .spec files still works. Adding a .spec file and configuring devstack to
work around the bug.

Change-Id: I041a5e9a526c2e63c92f3d01411afda8b7beb601
Closes-Bug: #1572369
Signed-off-by: Frederick F. Kautz IV <fkautz@redhat.com>
This commit is contained in:
Frederick F. Kautz IV 2016-04-21 18:15:56 -07:00
parent b822c22c8f
commit 07dca2a49b
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/plugin.sh
View File

@ -38,15 +38,15 @@ if is_service_enabled kuryr; then
elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
if [[ ! -d "${KURYR_JSON_DIR}" ]]; then if [[ ! -d "${KURYR_ACTIVATOR_DIR}" ]]; then
echo -n "${KURYR_JSON_DIR} directory is missing. Creating it... " echo -n "${KURYR_ACTIVATOR_DIR} directory is missing. Creating it... "
sudo mkdir -p ${KURYR_JSON_DIR} sudo mkdir -p ${KURYR_ACTIVATOR_DIR}
echo "Done" echo "Done"
fi fi
if [[ ! -f "${KURYR_JSON}" ]]; then if [[ ! -f "${KURYR_ACTIVATOR}" ]]; then
echo -n "${KURYR_JSON} is missing. Copying the default one... " echo -n "${KURYR_ACTIVATOR} is missing. Copying the default one... "
sudo cp ${KURYR_DEFAULT_JSON} ${KURYR_JSON} sudo cp ${KURYR_DEFAULT_ACTIVATOR} ${KURYR_ACTIVATOR}
echo "Done" echo "Done"
fi fi

8
devstack/settings
View File

@ -1,14 +1,14 @@
KURYR_HOME=${KURYR_HOME:-$DEST/kuryr} KURYR_HOME=${KURYR_HOME:-$DEST/kuryr}
KURYR_JSON_FILENAME=kuryr.json KURYR_ACTIVATOR_FILENAME=kuryr.spec
KURYR_DEFAULT_JSON=${KURYR_HOME}/etc/${KURYR_JSON_FILENAME} KURYR_DEFAULT_ACTIVATOR=${KURYR_HOME}/etc/${KURYR_ACTIVATOR_FILENAME}
KURYR_CONFIG_GENERATOR_FILENAME=kuryr-config-generator.conf KURYR_CONFIG_GENERATOR_FILENAME=kuryr-config-generator.conf
KURYR_CONFIG_GENERATOR=${KURYR_HOME}/etc/${KURYR_CONFIG_GENERATOR_FILENAME} KURYR_CONFIG_GENERATOR=${KURYR_HOME}/etc/${KURYR_CONFIG_GENERATOR_FILENAME}
# See libnetwork's plugin discovery mechanism: # See libnetwork's plugin discovery mechanism:
# https://github.com/docker/docker/blob/c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6/docs/extend/plugin_api.md#plugin-discovery # https://github.com/docker/docker/blob/c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6/docs/extend/plugin_api.md#plugin-discovery
KURYR_JSON_DIR=${KURYR_JSON_DIR:-/usr/lib/docker/plugins/kuryr} KURYR_ACTIVATOR_DIR=${KURYR_ACTIVATOR_DIR:-/usr/lib/docker/plugins/kuryr}
KURYR_JSON=${KURYR_JSON_DIR}/${KURYR_JSON_FILENAME} KURYR_ACTIVATOR=${KURYR_ACTIVATOR_DIR}/${KURYR_ACTIVATOR_FILENAME}
KURYR_CONFIG_FILENAME=kuryr.conf KURYR_CONFIG_FILENAME=kuryr.conf
KURYR_DEFAULT_CONFIG=${KURYR_HOME}/etc/${KURYR_CONFIG_FILENAME} KURYR_DEFAULT_CONFIG=${KURYR_HOME}/etc/${KURYR_CONFIG_FILENAME}

1
etc/kuryr.spec Normal file
View File

@ -0,0 +1 @@
http://127.0.0.1:2377