From 07dca2a49ba1d127e1ca67463783e1f92346e1af Mon Sep 17 00:00:00 2001
From: "Frederick F. Kautz IV" <fkautz@redhat.com>
Date: Thu, 21 Apr 2016 18:15:56 -0700
Subject: [PATCH] Activate libnetwork plugin with .spec instead of .json

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>
---
 devstack/plugin.sh | 12 ++++++------
 devstack/settings  |  8 ++++----
 etc/kuryr.spec     |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 etc/kuryr.spec

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a640ab89..61e445d4 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -38,15 +38,15 @@ if is_service_enabled kuryr; then
 
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
 
-        if [[ ! -d "${KURYR_JSON_DIR}" ]]; then
-            echo -n "${KURYR_JSON_DIR} directory is missing. Creating it... "
-            sudo mkdir -p ${KURYR_JSON_DIR}
+        if [[ ! -d "${KURYR_ACTIVATOR_DIR}" ]]; then
+            echo -n "${KURYR_ACTIVATOR_DIR} directory is missing. Creating it... "
+            sudo mkdir -p ${KURYR_ACTIVATOR_DIR}
             echo "Done"
         fi
 
-        if [[ ! -f "${KURYR_JSON}" ]]; then
-             echo -n "${KURYR_JSON} is missing. Copying the default one... "
-             sudo cp ${KURYR_DEFAULT_JSON} ${KURYR_JSON}
+        if [[ ! -f "${KURYR_ACTIVATOR}" ]]; then
+             echo -n "${KURYR_ACTIVATOR} is missing. Copying the default one... "
+             sudo cp ${KURYR_DEFAULT_ACTIVATOR} ${KURYR_ACTIVATOR}
              echo "Done"
         fi
 
diff --git a/devstack/settings b/devstack/settings
index d1649dde..0fe09067 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,14 +1,14 @@
 
 KURYR_HOME=${KURYR_HOME:-$DEST/kuryr}
-KURYR_JSON_FILENAME=kuryr.json
-KURYR_DEFAULT_JSON=${KURYR_HOME}/etc/${KURYR_JSON_FILENAME}
+KURYR_ACTIVATOR_FILENAME=kuryr.spec
+KURYR_DEFAULT_ACTIVATOR=${KURYR_HOME}/etc/${KURYR_ACTIVATOR_FILENAME}
 KURYR_CONFIG_GENERATOR_FILENAME=kuryr-config-generator.conf
 KURYR_CONFIG_GENERATOR=${KURYR_HOME}/etc/${KURYR_CONFIG_GENERATOR_FILENAME}
 
 # See libnetwork's plugin discovery mechanism:
 #   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_JSON=${KURYR_JSON_DIR}/${KURYR_JSON_FILENAME}
+KURYR_ACTIVATOR_DIR=${KURYR_ACTIVATOR_DIR:-/usr/lib/docker/plugins/kuryr}
+KURYR_ACTIVATOR=${KURYR_ACTIVATOR_DIR}/${KURYR_ACTIVATOR_FILENAME}
 
 KURYR_CONFIG_FILENAME=kuryr.conf
 KURYR_DEFAULT_CONFIG=${KURYR_HOME}/etc/${KURYR_CONFIG_FILENAME}
diff --git a/etc/kuryr.spec b/etc/kuryr.spec
new file mode 100644
index 00000000..81fd123b
--- /dev/null
+++ b/etc/kuryr.spec
@@ -0,0 +1 @@
+http://127.0.0.1:2377