From 7dcda31fe01f5fe910033a0ff97eb1ba795ee680 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Thu, 22 Jun 2017 08:45:04 -0700
Subject: cleanup: remove fuel plugin since fuel@opnfv uses mcp

Change-Id: I1c745106c1db5e69ba698d9076ae6c707dbc37b7
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 .../manifests/collectd-ceilometer_install.pp       | 29 ----------------------
 .../puppet/manifests/collectd_install.pp           |  5 ----
 .../puppet/manifests/collectd_restart.pp           |  4 ---
 3 files changed, 38 deletions(-)
 delete mode 100644 src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
 delete mode 100644 src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp
 delete mode 100644 src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp

(limited to 'src/fuel-plugin/deployment_scripts/puppet/manifests')

diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
deleted file mode 100644
index 4da567d6..00000000
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-$master_ip         = hiera('master_ip')
-$use_ceilometer    = hiera('use_ceilometer', false)
-
-$management_vip    = hiera('management_vip')
-$service_endpoint  = hiera('service_endpoint', $management_vip)
-$ssl_hash          = hiera_hash('use_ssl', {})
-$auth_protocol     = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http')
-$auth_endpoint     = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'hostname', [$service_endpoint])
-$auth_uri          = "${auth_protocol}://${auth_endpoint}:5000/v2.0"
-
-$ceilometer_hash   = hiera_hash('ceilometer', {'user'=>'ceilometer'})
-$auth_user         = 'ceilometer'
-$auth_password     = $ceilometer_hash['user_password']
-
-
-$collectd_settings   = hiera('fuel-plugin-collectd-ceilometer')
-$enable_mcelog       = $collectd_settings['enable_mcelog']
-$enable_hugepages    = $collectd_settings['enable_hugepages']
-$enable_ovs_events   = $collectd_settings['enable_ovs_events']
-
-$exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/deployment_scripts/install.sh"
-
-if ($use_ceilometer) {
-
-    exec { "install collectd-ceilometer":
-        command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password} ${enable_mcelog} ${enable_hugepages} ${enable_ovs_events}",
-        path   => "/usr/bin:/usr/sbin:/bin:/sbin";
-    }
-}
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp
deleted file mode 100644
index ffe3d6d9..00000000
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_install.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-if $operatingsystem == 'Ubuntu' {
-    package { 'collectd':
-        ensure => installed,
-    }
-}
diff --git a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp
deleted file mode 100644
index 59f5151b..00000000
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd_restart.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-exec { "restart collectd":
-    command => "service collectd restart",
-    path   => "/usr/bin:/usr/sbin:/bin:/sbin";
-}
-- 
cgit 1.2.3-korg