Merge "Only install proliantutils if ilo is enabled; support idrac"

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"
+- name: "Install vendor dependencies"
-  include_role:
+  import_tasks: vendor_deps.yml
-    name: bifrost-pip-install
-  vars:
-    package: proliantutils
 
 - name: "Install iSCSI client and dependencies if iscsi deploy interface is enabled"
   package:

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"