From 9693f775b60de508e841f1a85297a99d5d05fd0a Mon Sep 17 00:00:00 2001
From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Fri, 3 Feb 2017 18:56:01 +0000
Subject: fuel: remove RDT plugin

Change-Id: Id78f38ac19bfae046c26283d72a9495524416016
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
---
 src/fuel-plugin/deployment_scripts/install.sh      | 24 ++--------------------
 .../manifests/collectd-ceilometer_install.pp       |  3 +--
 2 files changed, 3 insertions(+), 24 deletions(-)

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

diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 98605a19..4c6da70b 100755
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -8,9 +8,8 @@ OS_AUTH_URL=$2
 OS_USERNAME=$3
 OS_PASSWORD=$4
 enable_mcelog=$5
-enable_intel_rdt=$6
-enable_hugepages=$7
-enable_ovs_events=$8
+enable_hugepages=$6
+enable_ovs_events=$7
 
 CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
 CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
@@ -22,12 +21,6 @@ rm -rf $INSTALL_HOME; mkdir -p $INSTALL_HOME
 cd $INSTALL_HOME
 curl http://$HOST:8080/plugins/fuel-plugin-collectd-ceilometer-1.0/repositories/ubuntu/collectd-ceilometer.tgz | tar xzvf -
 
-cat << EOF > /etc/ld.so.conf.d/pqos.conf
-$INSTALL_HOME/lib
-EOF
-ldconfig
-modprobe msr
-
 apt-get install -y --allow-unauthenticated collectd python-dev libpython2.7 mcelog
 
 cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
@@ -68,19 +61,6 @@ cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
 </Plugin>
 EOF
 
-if [ $enable_intel_rdt = 'true' ]
-then
-    cat << EOF > /etc/collectd/collectd.conf.d/intel-rdt.conf
-<LoadPlugin intel_rdt>
-  Interval 1
-</LoadPlugin>
-
-<Plugin "intel_rdt">
-  Cores ""
-</Plugin>
-EOF
-fi
-
 if [ $enable_hugepages = 'true' ]
 then
     cat << EOF > /etc/collectd/collectd.conf.d/hugepages.conf
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
index cbbfcad2..4da567d6 100644
--- a/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
+++ b/src/fuel-plugin/deployment_scripts/puppet/manifests/collectd-ceilometer_install.pp
@@ -15,7 +15,6 @@ $auth_password     = $ceilometer_hash['user_password']
 
 $collectd_settings   = hiera('fuel-plugin-collectd-ceilometer')
 $enable_mcelog       = $collectd_settings['enable_mcelog']
-$enable_intel_rdt    = $collectd_settings['enable_intel_rdt']
 $enable_hugepages    = $collectd_settings['enable_hugepages']
 $enable_ovs_events   = $collectd_settings['enable_ovs_events']
 
@@ -24,7 +23,7 @@ $exe_url = "http://${master_ip}:8080/plugins/fuel-plugin-collectd-ceilometer-1.0
 if ($use_ceilometer) {
 
     exec { "install collectd-ceilometer":
-        command => "curl ${exe_url} | bash -s ${master_ip} ${auth_uri} ${auth_user} ${auth_password} ${enable_mcelog} ${enable_intel_rdt} ${enable_hugepages} ${enable_ovs_events}",
+        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";
     }
 }
-- 
cgit 1.2.3-korg