Revert "Add config option default_data_file"

default_data_uri option handles local file already, path need to be
prefixed with 'file://', for example:
default_data_uri = file:///path/to/default_data.json

This reverts commit 1888bfb60c.

Change-Id: I558238dbfc633793013451f836c7ce449e94c6c5
Signed-off-by: Pierre-Louis Bonicoli <pierre-louis.bonicoli@libregerbil.fr>
This commit is contained in:
Pierre-Louis Bonicoli
2017-03-09 11:28:45 +01:00
parent 224078d7c5
commit dd4ba31bfd
3 changed files with 1 additions and 14 deletions

View File

@@ -313,10 +313,7 @@ def main():
runtime_storage_inst = runtime_storage.get_runtime_storage(
CONF.runtime_storage_uri)
if CONF.default_data_file:
default_data = utils.read_json_from_file(CONF.default_data_file)
else:
default_data = utils.read_json_from_uri(CONF.default_data_uri)
default_data = utils.read_json_from_uri(CONF.default_data_uri)
if not default_data:
LOG.critical('Unable to load default data')
return not 0