openstack/devstack
Code Issues Proposed changes

Merge "Fix error in configure_nova_hypervisor with hardware Ironic node"

Browse Source
This commit is contained in:
Zuul 2019-07-29 12:51:58 +00:00 committed by Gerrit Code Review
commit 2542354fb5
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova_plugins/hypervisor-ironic
View File

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