Fix amulet test that should have been resolved in commit 616ba36
Also resolve merge collision between commits 2f8b158b and
616ba364 that accidentally enabled rbd_flatten_volume_from_snapshot
for >= Ocata rather than >= Queens (which is also causing the
amulet test to fail).
c57c115...
by
OpenDev Sysadmins <email address hidden>
OpenDev Migration Patch
This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:
Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.
Expose rbd_flatten_volume_from_snapshot to the user which allows
then to flatten volumes created from snapshots to remove
dependency from volume to snapshot.
