Merge "Fix error in configure_nova_hypervisor with hardware Ironic node"