From 1ac7dfe9e71a4fc917756bdf3020b31d58a2050c Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Tue, 20 Jul 2021 14:37:39 +0200
Subject: [PATCH] Install sushy-oem-idrac for idrac-redfish-virtual-media

Change-Id: I69d073e4fdcd52dbf9e6c8da6cd4626aaa98c16f
---
 playbooks/roles/bifrost-ironic-install/tasks/install.yml   | 6 +++---
 .../roles/bifrost-ironic-install/tasks/vendor_deps.yml     | 7 +++++--
 releasenotes/notes/sushy-oem-idrac-34f4bd1560f6948f.yaml   | 5 +++++
 3 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/sushy-oem-idrac-34f4bd1560f6948f.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
index 3a05828d6..c66b29ccc 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml
@@ -28,9 +28,6 @@
 - name: "Ensure /opt/stack is present"
   file: name=/opt/stack state=directory owner=root group=root
 
-- name: "Install vendor dependencies"
-  import_tasks: vendor_deps.yml
-
 - name: "IPA-builder - Install"
   include_role:
     name: bifrost-pip-install
@@ -65,6 +62,9 @@
     sourcedir: "{{ sushy_git_folder }}"
     source_install: "{{ sushy_source_install }}"
 
+- name: "Install vendor dependencies"
+  import_tasks: vendor_deps.yml
+
 - name: "Ironic Client - Install"
   include_role:
     name: bifrost-pip-install
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml b/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml
index 7b6bad794..c53d9da48 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml
@@ -18,9 +18,12 @@
     package: proliantutils
   when: "'ilo' in enabled_hardware_types"
 
-- name: "dracclient - Install"
+- name: "dracclient, sushy-oem-idrac - Install"
   include_role:
     name: bifrost-pip-install
   vars:
-    package: python-dracclient
+    package: "{{ item }}"
+  loop:
+    - python-dracclient
+    - sushy-oem-idrac
   when: "'idrac' in enabled_hardware_types"
diff --git a/releasenotes/notes/sushy-oem-idrac-34f4bd1560f6948f.yaml b/releasenotes/notes/sushy-oem-idrac-34f4bd1560f6948f.yaml
new file mode 100644
index 000000000..002dff103
--- /dev/null
+++ b/releasenotes/notes/sushy-oem-idrac-34f4bd1560f6948f.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Installs `sushy-oem-idrac <https://pypi.org/project/sushy-oem-idrac/>`_
+    when the ``idrac`` hardware type is enabled.