openstack
/
solum
Code Issues Proposed changes

Workaround for oslo duplicate config issue 

Providing sample config instead of generating it,
since config generation is running into trouble
as outlined in the bug description.

This is a workaround till we identify the root
cause of the issue and address it.

Change-Id: Ide4cbbe711a5c48fd1ff93251037c0b8b16f385d
Related-Bug: #1555788
This commit is contained in:
Devdatta Kulkarni 2016-03-10 14:40:17 -06:00
parent 59e21006a2
commit 5bea1d2547
3 changed files with 1178 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devstack/plugin.sh
View File

@ -84,10 +84,14 @@ function configure_solum() {
# Generate sample config and configure common parameters.
mkdir -p /tmp/solum
pushd $SOLUM_DIR
oslo-config-generator --config-file=${SOLUM_DIR}/etc/solum/config-generator.conf --output-file=/tmp/solum/solum.conf.sample
popd
cp /tmp/solum/solum.conf.sample $SOLUM_CONF_DIR/$SOLUM_CONF_FILE
# TODO(devkulkarni): Commenting out config generation for now to get around following bug
# https://bugs.launchpad.net/solum/+bug/1555788. Instead, including a sample config in the repo
#pushd $SOLUM_DIR
# oslo-config-generator --config-file=${SOLUM_DIR}/etc/solum/config-generator.conf --output-file=/tmp/solum/solum.conf.sample
#popd
#cp /tmp/solum/solum.conf.sample $SOLUM_CONF_DIR/$SOLUM_CONF_FILE
cp ${SOLUM_DIR}/devstack/solum.conf.sample $SOLUM_CONF_DIR/$SOLUM_CONF_FILE
iniset $SOLUM_CONF_DIR/$SOLUM_CONF_FILE DEFAULT debug $SOLUM_DEBUG

1168
devstack/solum.conf.sample Normal file
View File

File diff suppressed because it is too large Load Diff

4
solum/config.py
View File

@ -16,7 +16,7 @@
from oslo_config import cfg
from solum.common import config
from solum.common import config as common_config
from solum import version
@ -25,4 +25,4 @@ def parse_args(argv, default_config_files=None):
project='solum',
version=version.version_string(),
default_config_files=default_config_files)
config.set_config_defaults()
common_config.set_config_defaults()