openstack
/
kuryr
Code Issues Proposed changes

Merge "Change generator config file from tox to oslo-config-generator"

This commit is contained in:
Jenkins 2015-12-28 03:04:15 +00:00 committed by Gerrit Code Review
parent 9df9f1e54f 1f86c28000
commit 57833192b7
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/plugin.sh
View File

@ -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 -

2
devstack/settings
View File

@ -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