Updated openstack/openstack
Project: openstack/glance  1a9e0e94c36127d525c41f03c4223c3e0c2eda03
null
Check first matching rule for protected properties

When using roles to define protected properties, the first matching rule
in the config file should be used to grant/deny access. This change
enforces that behaviour.

References bug 1271426

Change-Id: Id897085f93bcd143ec443f477f666d4cabd77567
(Cherry-picked from b6dd538569ebf0f1580c8e1fadc5e0f8054c9b08)
Conflicts:
    glance/common/property_utils.py
    glance/tests/etc/property-protections.conf
    glance/tests/unit/common/test_property_utils.py
Updated openstack/openstack
Project: openstack/nova  c09a51cf2675d2821f8c8275ed23aaa23aeeca3c
null
Setup destination disk from virt_disk_size

When running live-migration --block-migrate on a qcow2 backed
VM without cow image, the destination qcow2 file should be created
with the virtual disk size. For raw images, the virt_disk_size
is set to disk_size to ensure that virt_disk_size is always the
size of the disk that should be re-created.

Update unit tests to be more strict and check for sizes to be correct.

Closes-Bug: #1257355

Change-Id: Ie3be46024f06b9f59af92f5e3918a1958386d4f1