summaryrefslogtreecommitdiffstats
path: root/nova/openstack
diff options
context:
space:
mode:
authorKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-10-04 16:23:14 -0500
committerKevin L. Mitchell <kevin.mitchell@rackspace.com>2012-10-04 16:23:14 -0500
commit1c68e733ca0e536ea95ac982d1b4b43ed143b3e2 (patch)
tree8b998f9dd2b3909cf24822d3050e3cd298078d86 /nova/openstack
parentdf22ef9c0f45fe29353d8bbc020f488cfe9314ce (diff)
downloadnova-1c68e733ca0e536ea95ac982d1b4b43ed143b3e2.tar.gz
nova-1c68e733ca0e536ea95ac982d1b4b43ed143b3e2.tar.xz
nova-1c68e733ca0e536ea95ac982d1b4b43ed143b3e2.zip
Move snapshot image property inheritance
The xenapi snapshotting code had support for inheriting properties from the base image of the snapshot (by way of the system metadata set on the snapshotted instance). The problem, however, came in the fact that some image properties were set in nova.compute.api, but those properties were not excluded from this inheritance logic except through a configuration option called "non_inheritable_image_properties". I had previously updated the default setting for this option to work around the bugs introduced by setting image properties in two different locations, but now it is time for the real fix. This change moves the inheritance logic into nova.compute.api:API._create_image. Note that two properties are still set through the xenapi snapshotting logic: the "os_type" and the "auto_disk_config" properties, which are presumed to be xenapi specific. The change also alters the inheritance logic to ensure that the work-around listing of image properties in non_inheritable_image_properties is no longer necessary; the default for this configuration option is updated accordingly. (Note: It will not harm anything to have these image properties still listed in non_inheritable_image_properties, so configurations that override this option do not need to be altered.) Change-Id: I3514da432cc10c75418e1de9752f60640d579136
Diffstat (limited to 'nova/openstack')
0 files changed, 0 insertions, 0 deletions