diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-31 00:11:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-31 00:11:41 +0000 |
| commit | 100528f3a0df724c5a9611f0e7a0cce41ca5e12e (patch) | |
| tree | f4d0faa051ba00451779e87a4293e7c3820d9a08 | |
| parent | d56b5fc3ad6dbfc56e0729174925fb146cef87fa (diff) | |
| parent | aab2f2e6733e1087a30782c43cf688e427a28f35 (diff) | |
| download | nova-100528f3a0df724c5a9611f0e7a0cce41ca5e12e.tar.gz nova-100528f3a0df724c5a9611f0e7a0cce41ca5e12e.tar.xz nova-100528f3a0df724c5a9611f0e7a0cce41ca5e12e.zip | |
Merge "Fix image_type=base after snapshot"
| -rw-r--r-- | nova/flags.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/nova/flags.py b/nova/flags.py index 23e42bd30..9c98bbdf4 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -415,7 +415,13 @@ global_opts = [ default='noauth', help='The strategy to use for auth: noauth or keystone.'), cfg.ListOpt('non_inheritable_image_properties', - default=['cache_in_nova'], + default=['cache_in_nova', + 'instance_uuid', + 'user_id', + 'image_type', + 'backup_type', + 'min_ram', + 'min_disk'], help='These are image properties which a snapshot should not' ' inherit from an instance'), ] |