Reviewed: https://review.openstack.org/604039 Committed: https://git.openstack.org/cgit/openstack/nova/commit/?id=87883c13750a149ef6e6783a66d1a86472c842d5 Submitter: Zuul Branch: stable/pike
commit 87883c13750a149ef6e6783a66d1a86472c842d5 Author: Lee Yarwood <email address hidden> Date: Thu Sep 20 14:06:29 2018 +0300
libvirt: Reduce calls to qemu-img during update_available_resource
I464bc2b88123a012cd12213beac4b572c3c20a56 introduced a second call to ``qemu-img`` that can easily be collapsed into one with the addition of a new call within the disk_api.
Conflicts: nova/tests/unit/virt/libvirt/test_driver.py
NOTE(s10): The conflict was due to not having change Ic853743573aa0b74d5d2c5b8b47252b875d5f7ef in Queens.
NOTE(s10): Another conflict was due to not having change I11e329ac5f5fe4b9819fefbcc32ff1ee504fc58b in Pike.
Related-Bug: #1785827 Change-Id: Ibfd0527ed79f60282b542034d7cb97b424becba3 (cherry picked from commit d41ea9d87894111051b591d513cd046e5e357124) (cherry picked from commit d085c8fe536e28ff8a3d757c8407fce37ffc00e4)
Reviewed: https:/ /review. openstack. org/604039 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=87883c13750 a149ef6e6783a66 d1a86472c842d5
Committed: https:/
Submitter: Zuul
Branch: stable/pike
commit 87883c13750a149 ef6e6783a66d1a8 6472c842d5
Author: Lee Yarwood <email address hidden>
Date: Thu Sep 20 14:06:29 2018 +0300
libvirt: Reduce calls to qemu-img during update_ available_ resource
I464bc2b881 23a012cd12213be ac4b572c3c20a56 introduced a second call to
``qemu-img`` that can easily be collapsed into one with the addition of
a new call within the disk_api.
Conflicts:
nova/tests/ unit/virt/ libvirt/ test_driver. py
NOTE(s10): The conflict was due to not having change aa0b74d5d2c5b8b 47252b875d5f7ef in Queens.
Ic853743573
NOTE(s10): Another conflict was due to not having change 5fe4b9819fefbcc 32ff1ee504fc58b in Pike.
I11e329ac5f
Related-Bug: #1785827 282b542034d7cb9 7b424becba3 051b591d513cd04 6e5e357124) f8a3d757c8407fc e37ffc00e4)
Change-Id: Ibfd0527ed79f60
(cherry picked from commit d41ea9d87894111
(cherry picked from commit d085c8fe536e28f