diff --git a/lib/ironic b/lib/ironic index 58cc2fa48e..b99e3255d5 100644 --- a/lib/ironic +++ b/lib/ironic @@ -181,7 +181,11 @@ function is_deployed_with_ipa_ramdisk { # install_ironic() - Collect source and prepare function install_ironic { # make sure all needed service were enabled - for srv in nova glance key; do + local req_services="mysql rabbit key" + if [[ "$VIRT_DRIVER" == "ironic" ]]; then + req_services+=" nova glance neutron" + fi + for srv in $req_services; do if ! is_service_enabled "$srv"; then die $LINENO "$srv should be enabled for Ironic." fi diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 0169d731e8..b9e286d5b6 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -54,9 +54,7 @@ function configure_nova_hypervisor { # install_nova_hypervisor() - Install external components 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 + if is_ironic_hardware; then return fi install_libvirt