[Merge] ~mfo/ubuntu/+source/nova:lp1960758-ussuri into ~ubuntu-openstack-dev/ubuntu/+source/nova:stable/ussuri

[Corey Bryant]

Hi Mauricio,

This looks fairly reasonable. I'm just concerned with the upgrade path from ussuri->victoria and forward. Have you tested upgrades? Is this patch needed in victoria as well? Should we add the config option with a deprecation notice of when it will be removed (could be modeled after config_drive_format perhaps)?

Thanks,
Corey
-- 
https://code.launchpad.net/~mfo/ubuntu/+source/nova/+git/nova/+merge/447799
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~mfo/ubuntu/+source/nova:lp1960758-ussuri into ~ubuntu-openstack-dev/ubuntu/+source/nova:stable/ussuri.