Browse code
Merge "Fix error in configure_nova_hypervisor with hardware Ironic node"
Zuul authored on 2019/07/29 21:51:58Showing 1 changed files
| ... | ... |
@@ -36,7 +36,9 @@ function cleanup_nova_hypervisor {
|
| 36 | 36 |
|
| 37 | 37 |
# configure_nova_hypervisor - Set config files, create data dirs, etc |
| 38 | 38 |
function configure_nova_hypervisor {
|
| 39 |
- configure_libvirt |
|
| 39 |
+ if ! is_ironic_hardware; then |
|
| 40 |
+ configure_libvirt |
|
| 41 |
+ fi |
|
| 40 | 42 |
LIBVIRT_FIREWALL_DRIVER=${LIBVIRT_FIREWALL_DRIVER:-"nova.virt.firewall.NoopFirewallDriver"}
|
| 41 | 43 |
|
| 42 | 44 |
iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver |