From ed26a1963b05530a915676cb98048996bd618a9d Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Mon, 15 Jun 2020 12:54:18 +0200 Subject: [PATCH] Only install proliantutils if ilo is enabled; support idrac Change-Id: Idd850a58349bb7677d1fa2c72afed1578b26e938 --- .../bifrost-ironic-install/tasks/install.yml | 7 ++--- .../tasks/vendor_deps.yml | 26 +++++++++++++++++++ 2 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml diff --git a/playbooks/roles/bifrost-ironic-install/tasks/install.yml b/playbooks/roles/bifrost-ironic-install/tasks/install.yml index 7f0bfa53f..b98285bab 100644 --- a/playbooks/roles/bifrost-ironic-install/tasks/install.yml +++ b/playbooks/roles/bifrost-ironic-install/tasks/install.yml @@ -37,11 +37,8 @@ - name: "Ensure /opt/stack is present" file: name=/opt/stack state=directory owner=root group=root -- name: "proliantutils - Install from pip" - include_role: - name: bifrost-pip-install - vars: - package: proliantutils +- name: "Install vendor dependencies" + import_tasks: vendor_deps.yml - name: "Install iSCSI client and dependencies if iscsi deploy interface is enabled" package: diff --git a/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml b/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml new file mode 100644 index 000000000..7b6bad794 --- /dev/null +++ b/playbooks/roles/bifrost-ironic-install/tasks/vendor_deps.yml @@ -0,0 +1,26 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +--- +- name: "proliantutils - Install" + include_role: + name: bifrost-pip-install + vars: + package: proliantutils + when: "'ilo' in enabled_hardware_types" + +- name: "dracclient - Install" + include_role: + name: bifrost-pip-install + vars: + package: python-dracclient + when: "'idrac' in enabled_hardware_types"