From e9fa1e31ff1ac09a5dc01850dafaf014ee3e5956 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Thu, 15 Aug 2019 12:07:57 -0400 Subject: [PATCH] Install sushy if redfish is a hardware type Change-Id: I2b8750835f87d49e5b51c156f18a5c12d6d9884a --- devstack/lib/ironic | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index b8b4dfc119..87e7d56ae5 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -713,6 +713,11 @@ function is_ansible_deploy_enabled { return 1 } +function is_redfish_enabled { + [[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*redfish*}" ]] && return 0 + return 1 +} + function is_ansible_with_tinyipa { # NOTE(pas-ha) we support rebuilding the ramdisk to include (generated) SSH keys # as needed for ansible deploy interface only for TinyIPA ramdisks for now @@ -1032,7 +1037,7 @@ function install_ironic { restart_libvirt fi - if is_deployed_by_redfish; then + if is_redfish_enabled || is_deployed_by_redfish; then setup_sushy fi