Merge "Fix error in configure_nova_hypervisor with hardware Ironic node"

This commit is contained in:
Zuul 2019-07-29 12:51:58 +00:00 committed by Gerrit Code Review
commit 2542354fb5

View File

@ -36,7 +36,9 @@ function cleanup_nova_hypervisor {
# configure_nova_hypervisor - Set config files, create data dirs, etc
function configure_nova_hypervisor {
configure_libvirt
if ! is_ironic_hardware; then
configure_libvirt
fi
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver