From: Maryam Tahhan <maryam.tahhan@intel.com>
Date: Thu, 12 Jan 2017 09:43:10 +0000 (+0000)
Subject: fuel: update to include mcelog configuration
X-Git-Tag: danube.1.0~26
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F27139%2F1;p=barometer.git

fuel: update to include mcelog configuration

Update the barometer Fuel plugin to include mcelog plugin configuration.

Change-Id: Ibf0a86a40e73fdcebfed3efb21f6fb15b231db44
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>
Reviewed-by: Ruijing Gou <ruijing.guo@intel.com>
---

diff --git a/src/fuel-plugin/deployment_scripts/install.sh b/src/fuel-plugin/deployment_scripts/install.sh
index 93dfcae7..5491f340 100755
--- a/src/fuel-plugin/deployment_scripts/install.sh
+++ b/src/fuel-plugin/deployment_scripts/install.sh
@@ -11,6 +11,9 @@ OS_PASSWORD=$4
 CEILOMETER_URL_TYPE=${CEILOMETER_URL_TYPE:-internalURL}
 CEILOMETER_TIMEOUT=${CEILOMETER_TIMEOUT:-1000}
 
+MCELOG_SOCKET="socket-path = /var/run/mcelog-client"
+MCELOG_CONF="/etc/mcelog/mcelog.conf"
+
 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 -
@@ -21,7 +24,9 @@ EOF
 ldconfig
 modprobe msr
 
-apt-get install -y --allow-unauthenticated collectd python-dev libpython2.7
+apt-get install -y --allow-unauthenticated collectd python-dev libpython2.7 mcelog
+
+echo $MCELOG_SOCKET | sudo tee -a $MCELOG_CONF;
 
 cat << EOF > /etc/collectd/collectd.conf.d/collectd-ceilometer-plugin.conf
 <LoadPlugin python>
@@ -83,4 +88,13 @@ LoadPlugin hugepages
 </Plugin>
 EOF
 
+cat << EOF > /etc/collectd/collectd.conf.d/mcelog.conf
+<LoadPlugin mcelog>
+  Interval 1
+</LoadPlugin>
+<Plugin "mcelog">
+   McelogClientSocket "/var/run/mcelog-client"
+</Plugin>
+EOF
+
 service collectd restart