summaryrefslogtreecommitdiff
path: root/nova/cloudpipe
diff options
context:
space:
mode:
authorChris Yeoh <cyeoh@au1.ibm.com>2014-09-25 15:47:29 +0930
committerChris Yeoh <cyeoh@au1.ibm.com>2014-09-26 13:48:25 +0930
commitdfac11584cbbf20c98efcbf7b94a69cefda0514c (patch)
tree513edc00c54823a7ce1ed5197d9d7d49b2864d09 /nova/cloudpipe
parentda8a75a26eab4c0d2ffebb50f65dd7466a681e73 (diff)
downloadnova-dfac11584cbbf20c98efcbf7b94a69cefda0514c.tar.gz
Fixes potential reliablity issue with missing CONF import
Adds missing CONF.import lines for the keys_path config option in crypto.py. Although the code currently appears to work fine, missing import options can result in flakey unittests and so most likely problems in real Nova setups as well. Change-Id: I748a47ecf6b6f0a2ff14db2bcd402163fc0b011e
Diffstat (limited to 'nova/cloudpipe')
-rw-r--r--nova/cloudpipe/pipelib.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py
index 8962924b69..0bc929b77f 100644
--- a/nova/cloudpipe/pipelib.py
+++ b/nova/cloudpipe/pipelib.py
@@ -61,6 +61,7 @@ cloudpipe_opts = [
CONF = cfg.CONF
CONF.register_opts(cloudpipe_opts)
+CONF.import_opt('keys_path', 'nova.crypto')
LOG = logging.getLogger(__name__)