From ca40ced2f8e254c1fa0d198a63daee6cd40e1961 Mon Sep 17 00:00:00 2001
From: Janonymous <janonymous.codevulture@gmail.com>
Date: Tue, 30 Aug 2016 12:02:44 +0530
Subject: [PATCH] Update plugin loading for devstack

Closes-Bug: #1621306
Change-Id: Ieeed2af7433e44da926fad27c7bf1535a939f526
---
 devstack/local.conf.sample | 3 ---
 devstack/settings          | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/devstack/local.conf.sample b/devstack/local.conf.sample
index d95d1bcc..aa05a8d5 100644
--- a/devstack/local.conf.sample
+++ b/devstack/local.conf.sample
@@ -10,9 +10,6 @@ SERVICE_TOKEN=pass
 ADMIN_PASSWORD=pass
 
 enable_plugin kuryr-libnetwork https://git.openstack.org/openstack/kuryr-libnetwork
-enable_service kuryr-libnetwork
-enable_service etcd-server
-enable_service docker-engine
 
 # Use Neutron instead of nova-network
 disable_service n-net
diff --git a/devstack/settings b/devstack/settings
index 400466cb..627f7857 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -20,3 +20,5 @@ KURYR_POOL_PREFIX_LEN=${KURYR_POOL_PREFIX_LEN:-24}
 
 KURYR_DOCKER_ENGINE_PORT=${KURYR_DOCKER_ENGINE_PORT:-23750}
 KURYR_ETCD_PORT=${KURYR_ETCD_PORT:-4001}
+
+enable_service kuryr-libnetwork etcd-server docker-engine