From 37026f536663f6d915169b356db08ac5fe4831cb Mon Sep 17 00:00:00 2001 From: Zhongyue Luo Date: Tue, 16 Dec 2014 10:56:54 +0800 Subject: [PATCH] Avoid VM configuration with Ironic hardware mode. If "IRONIC_HARDWARE" is True, VMs are not required when using Ironic. Change-Id: I33ba294f1e2ea583cd4c24c392637a4ee60a39ab --- lib/nova_plugins/hypervisor-ironic | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 4c2043b6b5..0169d731e8 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -56,6 +56,8 @@ function configure_nova_hypervisor { function install_nova_hypervisor { if ! is_service_enabled neutron; then die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver." + elif is_ironic_hardware; then + return fi install_libvirt if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then