From 1f86c28000600c88aa9b6e4648dcb6b46f5c3bb8 Mon Sep 17 00:00:00 2001
From: kexiaodong <kexiaodong@huawei.com>
Date: Wed, 23 Dec 2015 00:37:37 -0800
Subject: [PATCH] Change generator config file from tox to
 oslo-config-generator

When restart tox script it will remove all python libraries and
download libraries again. In the case that git/pip frequently
timeout, this may cause failure of installation.
Closes-Bug: #1527961

Change-Id: I4671bb8436f38686c1ca638ea33a797bd23389a0
---
 devstack/plugin.sh | 3 +--
 devstack/settings  | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 523acfbb..748e4552 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -64,8 +64,7 @@ if is_service_enabled kuryr; then
             else
                 echo -n "${KURYR_CONFIG} and the  default config missing. Auto generating and copying one... "
                 cd ${KURYR_HOME}
-                pip_install tox
-                tox -egenconfig
+                oslo-config-generator --config-file=${KURYR_CONFIG_GENERATOR}
                 sudo cp ${KURYR_DEFAULT_CONFIG}.sample ${KURYR_DEFAULT_CONFIG}
                 sudo cp ${KURYR_DEFAULT_CONFIG} ${KURYR_CONFIG}
                 cd -
diff --git a/devstack/settings b/devstack/settings
index 8c56fccc..d1649dde 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -2,6 +2,8 @@
 KURYR_HOME=${KURYR_HOME:-$DEST/kuryr}
 KURYR_JSON_FILENAME=kuryr.json
 KURYR_DEFAULT_JSON=${KURYR_HOME}/etc/${KURYR_JSON_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