summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-04 17:01:48 +0000
committerGerrit Code Review <review@openstack.org>2012-10-04 17:01:48 +0000
commitf96fe43e63da0544e18fcf7631eb9a059b1bafe8 (patch)
tree7290dcad4e44bcfe9369f66e75b07c6e4a17d5e4 /nova/flags.py
parentb01c148f2fcf68514a276393a6b5a4f79a60f399 (diff)
parent216a83da476f2ea1ca3fcc6af3ac7dce6c20db27 (diff)
Merge "Add ability to download images via BitTorrent."
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 239e45385..9ab59bbe3 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -406,7 +406,8 @@ global_opts = [
'image_type',
'backup_type',
'min_ram',
- 'min_disk'],
+ 'min_disk',
+ 'bittorrent'],
help='These are image properties which a snapshot should not'
' inherit from an instance'),
cfg.BoolOpt('defer_iptables_apply',