commit 8142d526dfd6f4a56dbe382d25cf4110abf57f44
Author: Matt Riedemann <email address hidden>
Date: Tue Mar 21 13:18:08 2017 -0400
libvirt: conditionally set script path for ethernet vif types
Change I4f97c05e2dec610af22a5150dd27696e1d767896 worked around
a change introduced in libvirt 1.3.3 where the script path on
a LibvirtConfigGuestInterface could not be the emptry string
because libvirt would literally take that as the path and couldn't
resolve it, when in fact it used to indicate to libvirt that the
script path is a noop. This has been fixed in libvirt 3.1.
On Ubuntu with libvirt<1.3.3, if the script path is None then
it defaults to /etc/qemu-ifup which is blocked by AppArmor.
So this change adds a conditional check when setting the script
path value based on the libvirt version so we can straddle releases.
Change-Id: I192c61b93bd3736fdfe16b6a6906d58997d3eef9
Closes-Bug: #1665698
Related-Bug: #1649527
(cherry picked from commit a41d265a19b7bcb1af8fc179bf864e00023c6cc6)
(cherry picked from commit cc495a24656893c94031f491a3fed2bc94fe1850)
Reviewed: https:/ /review. openstack. org/448253 /git.openstack. org/cgit/ openstack/ nova/commit/ ?id=8142d526dfd 6f4a56dbe382d25 cf4110abf57f44
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 8142d526dfd6f4a 56dbe382d25cf41 10abf57f44
Author: Matt Riedemann <email address hidden>
Date: Tue Mar 21 13:18:08 2017 -0400
libvirt: conditionally set script path for ethernet vif types
Change I4f97c05e2dec61 0af22a5150dd276 96e1d767896 worked around estInterface could not be the emptry string
a change introduced in libvirt 1.3.3 where the script path on
a LibvirtConfigGu
because libvirt would literally take that as the path and couldn't
resolve it, when in fact it used to indicate to libvirt that the
script path is a noop. This has been fixed in libvirt 3.1.
On Ubuntu with libvirt<1.3.3, if the script path is None then
it defaults to /etc/qemu-ifup which is blocked by AppArmor.
So this change adds a conditional check when setting the script
path value based on the libvirt version so we can straddle releases.
Change-Id: I192c61b93bd373 6fdfe16b6a6906d 58997d3eef9 1af8fc179bf864e 00023c6cc6) 94031f491a3fed2 bc94fe1850)
Closes-Bug: #1665698
Related-Bug: #1649527
(cherry picked from commit a41d265a19b7bcb
(cherry picked from commit cc495a24656893c