Merge "fuel: remove RDT plugin"

5 files changed, 3 insertions, 66 deletions

diff --git a/src/fuel-plugin/build-collectd.sh b/src/fuel-plugin/build-collectd.sh
index 9e246353..92589721 100755
--- a/src/fuel-plugin/build-collectd.sh
+++ b/src/fuel-plugin/build-collectd.sh
@@ -66,20 +66,10 @@ sudo apt-get -y install \
     protobuf-c-compiler \
     python-dev
 
-
-
-cd ${BUILD_HOME}
-git clone https://github.com/01org/intel-cmt-cat.git
-cd intel-cmt-cat/
-git checkout c194e3a14d5efc1bd05a8ef7a49cfaf689f66937
-make
-sudo make install PREFIX=/fuel-plugin/build/qpos
-
 cd ${BUILD_HOME}
 rm -rf collectd
 git clone https://github.com/collectd/collectd; cd collectd; git checkout 36c657e9864856a10c1dba2519a22ab73d68ce76
 git clone https://github.com/collectd/pkg-debian; cd pkg-debian; git checkout 549d3caba74210ad762fe8c556801d9c11ab9876
-patch -p1 < /fuel-plugin/enable_pqos.diff
 cp -r debian ..
 
 cd ${BUILD_HOME}/collectd
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";
     }
 }
diff --git a/src/fuel-plugin/enable_pqos.diff b/src/fuel-plugin/enable_pqos.diff
deleted file mode 100644
index 1224a1f1..00000000
--- a/src/fuel-plugin/enable_pqos.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/debian/changelog b/debian/changelog
-index 88d2293..fa6bce1 100644
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -1,3 +1,10 @@
-+collectd (5.7.0-1) UNRELEASED; urgency=medium
-+
-+  * debian/rules:
-+    - enable ppos
-+
-+ -- Ruijing Guo <ruijing.guo@intel.com>  Thu, 22 Dec 2016 13:24:11 -0500
-+
- collectd (5.5.0-4) UNRELEASED; urgency=medium
- 
-   * debian/collectd-core.overrides:
-diff --git a/debian/rules b/debian/rules
-index ba7cfc0..d876e12 100755
---- a/debian/rules
-+++ b/debian/rules
-@@ -168,6 +168,7 @@ config.status: configure
- 	
- 	PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \
- 	./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
-+		--enable-syslog --enable-logfile --with-libpqos=/opt/pqos/--enable-debug \
- 		|| ( status=$$?; cat config.log; exit $$status )
- 
- build: build-arch build-indep
diff --git a/src/fuel-plugin/environment_config.yaml b/src/fuel-plugin/environment_config.yaml
index 125dfa53..95cea4fa 100644
--- a/src/fuel-plugin/environment_config.yaml
+++ b/src/fuel-plugin/environment_config.yaml
@@ -4,11 +4,6 @@ attributes:
       weight: 20
       value: false
       label: "Enable collectd for mcelog"
-    enable_intel_rdt:
-      type: "checkbox"
-      weight: 20
-      value: false
-      label: "Enable collectd for Intel RDT"
     enable_hugepages:
       type: "checkbox"
       weight: 20