From 1335bfa6a32858b259b699e26e26bbfa8d25ec04 Mon Sep 17 00:00:00 2001
From: vikaschoudhary16 <choudharyvikas16@gmail.com>
Date: Mon, 25 Jul 2016 17:05:22 +0530
Subject: [PATCH] Fix devstack installation for kuryr-libnetwork

Change-Id: Iafc88db02a4cb019a978c5183f4393b70a78f9bb
Closes-bug: #1604781
---
 devstack/local.conf.sample | 4 ++--
 devstack/plugin.sh         | 2 +-
 devstack/settings          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index 3048a0e2..d95d1bcc 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -9,8 +9,8 @@ SERVICE_PASSWORD=pass
 SERVICE_TOKEN=pass
 ADMIN_PASSWORD=pass
 
-enable_plugin kuryr https://git.openstack.org/openstack/kuryr
-enable_service kuryr
+enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
+enable_service kuryr-libnetwork
 enable_service etcd-server
 enable_service docker-engine
 
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 2c2376a0..47f94a56 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -41,7 +41,7 @@ function check_docker {
 
 
 # main loop
-if is_service_enabled kuryr; then
+if is_service_enabled kuryr-libnetwork; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         install_etcd_data_store
         setup_develop $KURYR_HOME
diff --git a/devstack/settings b/devstack/settings
index d748576b..400466cb 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,5 +1,5 @@
 
-KURYR_HOME=${KURYR_HOME:-$DEST/kuryr}
+KURYR_HOME=${KURYR_HOME:-$DEST/kuryr-libnetwork}
 KURYR_ACTIVATOR_FILENAME=kuryr.spec
 KURYR_DEFAULT_ACTIVATOR=${KURYR_HOME}/etc/${KURYR_ACTIVATOR_FILENAME}
 KURYR_CONFIG_GENERATOR_FILENAME=kuryr-config-generator.conf