From 71faf9842b5eb37fc8c861ad8206d896f6f5c927 Mon Sep 17 00:00:00 2001
From: Adrian Moreno <adrian@morenomartinez.com>
Date: Wed, 13 Jan 2016 15:18:13 +0100
Subject: [PATCH] Removes unused callhome configuration

Change-Id: Id829c09c0567619dd8830a9f0a1264c32b39eb88
---
 .../puppet/modules/scaleio_fuel/manifests/mdm.pp    |  4 +---
 .../puppet/modules/scaleio_fuel/manifests/params.pp | 13 -------------
 .../puppet/modules/scaleio_fuel/manifests/tb.pp     |  2 --
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/deployment_scripts/puppet/modules/scaleio_fuel/manifests/mdm.pp b/deployment_scripts/puppet/modules/scaleio_fuel/manifests/mdm.pp
index db8db72..3f4bd8f 100644
--- a/deployment_scripts/puppet/modules/scaleio_fuel/manifests/mdm.pp
+++ b/deployment_scripts/puppet/modules/scaleio_fuel/manifests/mdm.pp
@@ -7,7 +7,6 @@ class scaleio_fuel::mdm {
     $tb_ip                = $scaleio_fuel::params::tb_ip
     $cluster_name         = $scaleio_fuel::params::cluster_name
     $sio_sds_device       = $scaleio_fuel::params::sio_sds_device
-    $callhome_cfg         = $scaleio_fuel::params::callhome_cfg
 
     class {'::scaleio':
           password       => $admin_password,
@@ -17,7 +16,6 @@ class scaleio_fuel::mdm {
           tb_ip          => $tb_ip,
           cluster_name   => $cluster_name,
           sio_sds_device => $sio_sds_device,
-          callhome_cfg   => $callhome_cfg,
-          components     => ['mdm','gw','sds','sdc','callhome'],
+          components     => ['mdm','gw','sds','sdc'],
     }
 }
diff --git a/deployment_scripts/puppet/modules/scaleio_fuel/manifests/params.pp b/deployment_scripts/puppet/modules/scaleio_fuel/manifests/params.pp
index a481872..4fecc57 100644
--- a/deployment_scripts/puppet/modules/scaleio_fuel/manifests/params.pp
+++ b/deployment_scripts/puppet/modules/scaleio_fuel/manifests/params.pp
@@ -48,17 +48,4 @@ class scaleio_fuel::params
 
     notify {"SDS devices: ${sio_sds_device}": }
 
-    #TODO: Get callhome information from UI
-    $callhome_cfg = {
-      'email_to'      => 'emailto@address.com',
-      'email_from'    => 'emailfrom@address.com',
-      'username'      => 'monitor_username',
-      'password'      => 'monitor_password',
-      'customer'      => 'customer_name',
-      'smtp_host'     => 'smtp_host',
-      'smtp_port'     => 'smtp_port',
-      'smtp_user'     => 'smtp_user',
-      'smtp_password' => 'smtp_password',
-      'severity'      => 'error',
-    }
 }
diff --git a/deployment_scripts/puppet/modules/scaleio_fuel/manifests/tb.pp b/deployment_scripts/puppet/modules/scaleio_fuel/manifests/tb.pp
index c630ec0..c97f767 100644
--- a/deployment_scripts/puppet/modules/scaleio_fuel/manifests/tb.pp
+++ b/deployment_scripts/puppet/modules/scaleio_fuel/manifests/tb.pp
@@ -6,7 +6,6 @@ class scaleio_fuel::tb {
     $mdm_ip               = $scaleio_fuel::params::mdm_ip
     $tb_ip                = $scaleio_fuel::params::tb_ip
     $sio_sds_device       = $scaleio_fuel::params::sio_sds_device
-    $callhome_cfg         = $scaleio_fuel::params::callhome_cfg
 
     class {'::scaleio':
           password         => $admin_password,
@@ -16,7 +15,6 @@ class scaleio_fuel::tb {
           tb_ip            => $tb_ip,
           sio_sds_device   => $sio_sds_device,
           sds_ssd_env_flag => true,
-          callhome_cfg     => $callhome_cfg,
           components       => ['tb','gw','sds','sdc'],
     }
 }