Browse code

Merge "Make ironic's service check flexible"

Jenkins authored on 2015/03/27 02:13:41
Showing 2 changed files
... ...
@@ -181,7 +181,11 @@ function is_deployed_with_ipa_ramdisk {
181 181
 # install_ironic() - Collect source and prepare
182 182
 function install_ironic {
183 183
     # make sure all needed service were enabled
184
-    for srv in nova glance key; do
184
+    local req_services="mysql rabbit key"
185
+    if [[ "$VIRT_DRIVER" == "ironic" ]]; then
186
+        req_services+=" nova glance neutron"
187
+    fi
188
+    for srv in $req_services; do
185 189
         if ! is_service_enabled "$srv"; then
186 190
             die $LINENO "$srv should be enabled for Ironic."
187 191
         fi
... ...
@@ -54,9 +54,7 @@ function configure_nova_hypervisor {
54 54
 
55 55
 # install_nova_hypervisor() - Install external components
56 56
 function install_nova_hypervisor {
57
-    if ! is_service_enabled neutron; then
58
-        die $LINENO "Neutron should be enabled for usage of the Ironic Nova driver."
59
-    elif is_ironic_hardware; then
57
+    if is_ironic_hardware; then
60 58
         return
61 59
     fi
62 60
     install_libvirt