summaryrefslogtreecommitdiffstats
path: root/nova/crypto.py
diff options
context:
space:
mode:
authorSoren Hansen <soren.hansen@rackspace.com>2010-11-29 21:19:16 +0000
committerTarmac <>2010-11-29 21:19:16 +0000
commit4112e432c6a7b0e82bfc72fac0ceae8eca8bba49 (patch)
treebf8c7cd44d28ccb6b8bf26d374e757041fcb60a1 /nova/crypto.py
parent50db779e891244d5de9c4c67c8758c2d440aac16 (diff)
parent03deb0dde48a0b9c7c6c52689ecf8a70e1fa7b7e (diff)
downloadnova-4112e432c6a7b0e82bfc72fac0ceae8eca8bba49.tar.gz
nova-4112e432c6a7b0e82bfc72fac0ceae8eca8bba49.tar.xz
nova-4112e432c6a7b0e82bfc72fac0ceae8eca8bba49.zip
Add a templating mechanism in the flag parsing.
Add a state_path flag that will be used as the top-level dir for all other state (such as images, instances, buckets, networks, etc). This way you only need to change one flag to put all your state in e.g. /var/lib/nova. This simplifies packaging quite a bit.
Diffstat (limited to 'nova/crypto.py')
-rw-r--r--nova/crypto.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/crypto.py b/nova/crypto.py
index d73559587..aacc50b17 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -40,9 +40,9 @@ from nova import flags
FLAGS = flags.FLAGS
flags.DEFINE_string('ca_file', 'cacert.pem', 'Filename of root CA')
-flags.DEFINE_string('keys_path', utils.abspath('../keys'),
+flags.DEFINE_string('keys_path', '$state_path/keys',
'Where we keep our keys')
-flags.DEFINE_string('ca_path', utils.abspath('../CA'),
+flags.DEFINE_string('ca_path', '$state_path/CA',
'Where we keep our root CA')
flags.DEFINE_boolean('use_intermediate_ca', False,
'Should we use intermediate CAs for each project?')