From dc9e1c170b12a416f2214af011a2d9a382e00016 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Wed, 15 Mar 2017 17:39:42 +0800
Subject: [PATCH] Add deps to all that is needed

1) Add deps to all that is needed.
2) Fix lint issue.

Change-Id: I37c56dbad911193179a8912ec4916afc786b4d32
---
 manifests/drivers/drac.pp               |  2 ++
 manifests/drivers/hardware_interface.pp |  3 +++
 manifests/drivers/ilo.pp                | 19 ++++++++++---------
 manifests/drivers/ipmi.pp               |  1 -
 manifests/drivers/ssh.pp                |  1 -
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/manifests/drivers/drac.pp b/manifests/drivers/drac.pp
index a1473cba..b701cd28 100644
--- a/manifests/drivers/drac.pp
+++ b/manifests/drivers/drac.pp
@@ -23,6 +23,8 @@ class ironic::drivers::drac (
   $package_ensure = 'present',
 ) {
 
+  include ::ironic::deps
+
   ensure_packages('python-dracclient',
     {
       ensure => $package_ensure,
diff --git a/manifests/drivers/hardware_interface.pp b/manifests/drivers/hardware_interface.pp
index bee2169b..a52b3698 100644
--- a/manifests/drivers/hardware_interface.pp
+++ b/manifests/drivers/hardware_interface.pp
@@ -34,6 +34,9 @@ define ironic::drivers::hardware_interface (
   $enabled_list   = $::os_service_default,
   $default        = $::os_service_default,
 ) {
+
+  include ::ironic::deps
+
   if !is_service_default($enabled_list) and !empty($enabled_list){
     validate_array($enabled_list)
     $enabled_list_real = join($enabled_list, ',')
diff --git a/manifests/drivers/ilo.pp b/manifests/drivers/ilo.pp
index a7491961..859133fe 100644
--- a/manifests/drivers/ilo.pp
+++ b/manifests/drivers/ilo.pp
@@ -38,21 +38,22 @@
 #   (optional) The state of the proliantutils package
 #   Defaults to 'present'
 #
-
 class ironic::drivers::ilo (
-  $client_timeout               = $::os_service_default,
-  $client_port                  = $::os_service_default,
-  $use_web_server_for_images    = $::os_service_default,
-  $default_boot_mode            = $::os_service_default,
-  $package_ensure               = 'present',
+  $client_timeout            = $::os_service_default,
+  $client_port               = $::os_service_default,
+  $use_web_server_for_images = $::os_service_default,
+  $default_boot_mode         = $::os_service_default,
+  $package_ensure            = 'present',
 ) {
 
+  include ::ironic::deps
+
   # Configure ironic.conf
   ironic_config {
-    'ilo/client_timeout': value => $client_timeout;
-    'ilo/client_port': value => $client_port;
+    'ilo/client_timeout':            value => $client_timeout;
+    'ilo/client_port':               value => $client_port;
     'ilo/use_web_server_for_images': value => $use_web_server_for_images;
-    'ilo/default_boot_mode': value => $default_boot_mode;
+    'ilo/default_boot_mode':         value => $default_boot_mode;
   }
 
   ensure_packages('python-proliantutils',
diff --git a/manifests/drivers/ipmi.pp b/manifests/drivers/ipmi.pp
index 7a9b4559..c26df896 100644
--- a/manifests/drivers/ipmi.pp
+++ b/manifests/drivers/ipmi.pp
@@ -24,7 +24,6 @@
 #   Should be an interger value
 #   Defaults to '10'.
 #
-
 class ironic::drivers::ipmi (
   $retry_timeout = '10'
 ) {
diff --git a/manifests/drivers/ssh.pp b/manifests/drivers/ssh.pp
index 6a0a408e..4d767d59 100644
--- a/manifests/drivers/ssh.pp
+++ b/manifests/drivers/ssh.pp
@@ -21,7 +21,6 @@
 #   (optional) libvirt URI.
 #   Defaults to $::os_service_default.
 #
-
 class ironic::drivers::ssh (
   $libvirt_uri = $::os_service_default,
 ) {