summaryrefslogtreecommitdiff
path: root/trove/configuration
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-01-06 16:49:13 +0000
committerGerrit Code Review <review@openstack.org>2015-01-06 16:49:13 +0000
commit06ae4c5358fd544089f851f635ff3090f1ffabb6 (patch)
treea06a0c674e0fe1fc3c5694fc939d8fa608032f3c /trove/configuration
parent3e56c2177b30527475b04d0c0c099a55854942dc (diff)
parent7d26dfe906f3509c48fa7a14048e742c6d7268cb (diff)
downloadtrove-06ae4c5358fd544089f851f635ff3090f1ffabb6.tar.gz
Merge "Config Group Load Fails If DS Version Inactive"
Diffstat (limited to 'trove/configuration')
-rw-r--r--trove/configuration/models.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/trove/configuration/models.py b/trove/configuration/models.py
index abe3f05d..1bcfb666 100644
--- a/trove/configuration/models.py
+++ b/trove/configuration/models.py
@@ -397,7 +397,7 @@ def load_datastore_configuration_parameters(datastore,
config_file):
get_db_api().configure_db(CONF)
(ds, ds_v) = dstore_models.get_datastore_version(
- type=datastore, version=datastore_version)
+ type=datastore, version=datastore_version, return_inactive=True)
with open(config_file) as f:
config = json.load(f)
for param in config['configuration-parameters']: