summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorCory Wright <cory.wright@rackspace.com>2011-03-09 20:14:12 +0000
committerCory Wright <cory.wright@rackspace.com>2011-03-09 20:14:12 +0000
commit75b3b6807329663584f73ffc9b9612838dc04ef2 (patch)
tree34c38ebbe9348e639ea2ff870ce2bfda4f8900f4 /nova/flags.py
parentc7b5f477f5457278591bbef486237d4ae43a68eb (diff)
parent5662a822a013bd0d159c15b990231c4d1f12797f (diff)
downloadnova-75b3b6807329663584f73ffc9b9612838dc04ef2.tar.gz
nova-75b3b6807329663584f73ffc9b9612838dc04ef2.tar.xz
nova-75b3b6807329663584f73ffc9b9612838dc04ef2.zip
merge trunk
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 8cf199b2f..213d4d4e1 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -321,6 +321,8 @@ DEFINE_integer('auth_token_ttl', 3600, 'Seconds for auth tokens to linger')
DEFINE_string('state_path', os.path.join(os.path.dirname(__file__), '../'),
"Top-level directory for maintaining nova's state")
+DEFINE_string('lock_path', os.path.join(os.path.dirname(__file__), '../'),
+ "Directory for lock files")
DEFINE_string('logdir', None, 'output to a per-service log file in named '
'directory')