Browse code

Merge "Avoid VM configuration with Ironic hardware mode."

Jenkins authored on 2015/01/21 17:12:25
Showing 1 changed files
... ...
@@ -56,6 +56,8 @@ function configure_nova_hypervisor {
56 56
 function install_nova_hypervisor {
57 57
     if ! is_service_enabled neutron; then
58 58
         die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver."
59
+    elif is_ironic_hardware; then
60
+        return
59 61
     fi
60 62
     install_libvirt
61 63
     if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] && is_ubuntu; then