aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docs/release/userguide/collectd-ves-guest.conf29
-rw-r--r--docs/release/userguide/collectd-ves-host.conf26
-rw-r--r--docs/release/userguide/collectd.ves.userguide.rst333
-rw-r--r--docs/release/userguide/feature.userguide.rst11
-rw-r--r--src/Makefile3
-rw-r--r--src/collectd/Makefile2
-rw-r--r--src/collectd/collectd_sample_configs/intel_pmu.conf22
-rw-r--r--src/collectd/collectd_sample_configs/mcelog.conf5
-rwxr-xr-xsrc/collectd/snmp_mib_config.sh10
-rw-r--r--src/pmu-tools/Makefile5
-rwxr-xr-xsystems/build_base_machine.sh3
-rwxr-xr-xsystems/ubuntu/14.04/build_base_machine.sh81
12 files changed, 272 insertions, 258 deletions
diff --git a/docs/release/userguide/collectd-ves-guest.conf b/docs/release/userguide/collectd-ves-guest.conf
new file mode 100644
index 00000000..2ed814d5
--- /dev/null
+++ b/docs/release/userguide/collectd-ves-guest.conf
@@ -0,0 +1,29 @@
+LoadPlugin logfile
+<Plugin logfile>
+ LogLevel info
+ File "/opt/collectd/var/log/collectd.log"
+ Timestamp true
+ PrintSeverity false
+</Plugin>
+
+LoadPlugin cpu
+<Plugin cpu>
+ ReportByCpu true
+ ReportByState true
+ ValuesPercentage true
+</Plugin>
+
+LoadPlugin interface
+LoadPlugin memory
+LoadPlugin load
+LoadPlugin disk
+LoadPlugin uuid
+
+LoadPlugin write_kafka
+<Plugin write_kafka>
+ Property "metadata.broker.list" "localhost:9092"
+ <Topic "collectd">
+ Format JSON
+ </Topic>
+</Plugin>
+
diff --git a/docs/release/userguide/collectd-ves-host.conf b/docs/release/userguide/collectd-ves-host.conf
new file mode 100644
index 00000000..76706b5c
--- /dev/null
+++ b/docs/release/userguide/collectd-ves-host.conf
@@ -0,0 +1,26 @@
+LoadPlugin logfile
+<Plugin logfile>
+ LogLevel info
+ File "/opt/collectd/var/log/collectd.log"
+ Timestamp true
+ PrintSeverity false
+</Plugin>
+
+LoadPlugin cpu
+
+LoadPlugin virt
+<Plugin virt>
+ Connection "qemu:///system"
+ RefreshInterval 60
+ HostnameFormat uuid
+ PluginInstanceFormat name
+ ExtraStats "cpu_util"
+</Plugin>
+
+LoadPlugin write_kafka
+<Plugin write_kafka>
+ Property "metadata.broker.list" "localhost:9092"
+ <Topic "collectd">
+ Format JSON
+ </Topic>
+</Plugin>
diff --git a/docs/release/userguide/collectd.ves.userguide.rst b/docs/release/userguide/collectd.ves.userguide.rst
index 7077cecd..e7fcf738 100644
--- a/docs/release/userguide/collectd.ves.userguide.rst
+++ b/docs/release/userguide/collectd.ves.userguide.rst
@@ -10,52 +10,10 @@ The Barometer repository contains a python based application for VES.
The application currently supports pushing platform relevant metrics through the
additional measurements field for VES.
-Collectd has a write_kafka plugin that will send collectd metrics and values to
-a Kafka Broker.
-The VES application uses Kafka Consumer to receive metrics from the Kafka
-Broker.
+Collectd has a ``write_kafka`` plugin that sends collectd metrics and values to
+a Kafka Broker. The VES application uses Kafka Consumer to receive metrics
+from the Kafka Broker.
-Installation Instructions:
---------------------------
-1. Clone this repo:
-
- .. code:: bash
-
- git clone https://gerrit.opnfv.org/gerrit/barometer
-
-2. Install collectd
-
- .. code:: bash
-
- $ sudo apt-get install collectd
-
- CentOS 7.x use:
-
- .. code:: bash
-
- $ sudo yum install collectd
-
- .. note:: You may need to add epel repository if the above does not work.
-
- .. code:: bash
-
- $ sudo yun install epel-release
-
-3. Modify the collectd configuration script: `/etc/collectd/collectd.conf`
-
- .. code:: bash
-
- <Plugin write_kafka>
- Property "metadata.broker.list" "localhost:9092"
- <Topic "collectd">
- Format JSON
- </Topic>
- </Plugin>
-
- .. note::
-
- The above configuration is for a single host setup. Simply change localhost to remote
- server IP addess or hostname.
Install Kafka Broker
--------------------
@@ -86,7 +44,9 @@ Install Kafka Broker
$ sudo yum install zookeeper
- .. note:: You may need to add the the repository that contains zookeeper
+ .. note:: You may need to add the repository that contains zookeeper.
+ To do so, follow the step below and try to install `zookeeper` again
+ using steps above. Otherwise, skip next step.
.. code:: bash
@@ -99,11 +59,20 @@ Install Kafka Broker
$ sudo zookeeper-server start
+ if you get the error message like ``ZooKeeper data directory is missing at /var/lib/zookeeper``
+ during the start of zookeeper, initialize zookeeper data directory using
+ the command below and start zookeeper again, otherwise skip the next step.
+
+ .. code:: bash
+
+ $ sudo /usr/lib/zookeeper/bin/zkServer-initialize.sh
+ No myid provided, be sure to specify it in /var/lib/zookeeper/myid if using non-standalone
+
To test if Zookeeper is running as a daemon.
.. code:: bash
- $ sudo telnet localhost 2181
+ $ telnet localhost 2181
Type 'ruok' & hit enter.
Expected response is 'imok'. Zookeeper is running fine.
@@ -115,25 +84,26 @@ Install Kafka Broker
.. code:: bash
+ $ sudo yum install python-pip
$ sudo pip install kafka-python
2. Download Kafka:
.. code:: bash
- $ sudo wget "http://www-eu.apache.org/dist/kafka/0.11.0.0/kafka_2.11-0.11.0.0.tgz"
+ $ wget "http://www-eu.apache.org/dist/kafka/0.11.0.0/kafka_2.11-0.11.0.0.tgz"
3. Extract the archive:
.. code:: bash
- $ sudo tar -xvzf kafka_2.11-0.11.0.0.tgz
+ $ tar -xvzf kafka_2.11-0.11.0.0.tgz
4. Configure Kafka Server:
.. code:: bash
- $ sudo vi kafka_2.11-0.11.0.0/config/server.properties
+ $ vi kafka_2.11-0.11.0.0/config/server.properties
By default Kafka does not allow you to delete topics. Please uncomment:
@@ -170,180 +140,209 @@ Install Kafka Broker
localhost:2181 --topic TopicTest --from-beginning
-VES application configuration description:
-------------------------------------------
+Install collectd
+----------------
-Within the VES directory there is a configuration file called 'ves_app.conf'.
+Install development tools:
-.. note:: Details of the Vendor Event Listener REST service
+.. code:: bash
-REST resources are defined with respect to a ServerRoot:
+ $ sudo yum group install 'Development Tools'
+
+.. The libkafka installed via yum pkg manager is 0.11.0 which doesn't work with
+ collectd (compilation issue). Thus, we have to use the library installed
+ from sources using latest stable version which works with collectd.
+
+Install Apache Kafka C/C++ client library:
.. code:: bash
- ServerRoot = https://{Domain}:{Port}/{optionalRoutingPath}
+ $ git clone https://github.com/edenhill/librdkafka.git ~/librdkafka
+ $ cd ~/librdkafka
+ $ git checkout -b v0.9.5 v0.9.5
+ $ ./configure --prefix=/usr
+ $ make
+ $ sudo make install
-REST resources are of the form:
+Build collectd with Kafka support:
.. code:: bash
- {ServerRoot}/eventListener/v{apiVersion}`
- {ServerRoot}/eventListener/v{apiVersion}/{topicName}`
- {ServerRoot}/eventListener/v{apiVersion}/eventBatch`
+ $ git clone https://github.com/collectd/collectd.git ~/collectd
+ $ cd ~/collectd
+ $ ./build.sh
+ $ ./configure --with-librdkafka=/usr --without-perl-bindings --enable-perl=no
+ $ make && sudo make install
-**Domain** *"host"*
- VES domain name. It can be IP address or hostname of VES collector
- (default: `127.0.0.1`)
+Configure and start collectd. Create ``/opt/collectd/etc/collectd.conf``
+collectd configuration file as following:
-**Port** *port*
- VES port (default: `30000`)
+.. note:: The following collectd configuration file allows user to run VES
+ application in the guest mode. To run the VES in host mode, please follow
+ the `Configure VES in host mode`_ steps.
-**Path** *"path"*
- Used as the "optionalRoutingPath" element in the REST path (default: `empty`)
-
-**Topic** *"path"*
- Used as the "topicName" element in the REST path (default: `empty`)
+.. include:: collectd-ves-guest.conf
+ :code: bash
-**UseHttps** *true|false*
- Allow application to use HTTPS instead of HTTP (default: `false`)
+Start collectd process as a service as described in :ref:`install-collectd-as-a-service`.
-**Username** *"username"*
- VES collector user name (default: `empty`)
+.. Start collectd process as a service as described in `Barometer User Guide
+ <http://artifacts.opnfv.org/barometer/docs/index.html#installing-collectd-as-a-service>`_.
-**Password** *"passwd"*
- VES collector password (default: `empty`)
-**FunctionalRole** *"role"*
- Used as the 'functionalRole' field of 'commonEventHeader' event (default:
- `Collectd VES Agent`)
+Setup VES Test Collector
+------------------------
-**SendEventInterval** *interval*
- This configuration option controls how often (sec) collectd data is sent to
- Vendor Event Listener (default: `20`)
+.. note:: Test Collector setup is required only for VES application testing
+ purposes.
-**ApiVersion** *version*
- Used as the "apiVersion" element in the REST path (default: `5.1`)
+Install dependencies:
-**KafkaPort** *port*
- Kafka Port (Default ``9092``)
+.. code:: bash
-**KafkaBroker** *host*
- Kafka Broker domain name. It can be an IP address or hostname of local or remote server
- (default: localhost)
+ $ sudo pip install jsonschema
-Other collectd.conf configurations
-----------------------------------
-Please ensure that FQDNLookup is set to false
+Clone VES Test Collector:
.. code:: bash
- FQDNLookup false
+ $ git clone https://github.com/att/evel-test-collector.git ~/evel-test-collector
-Please ensure that the virt plugin is enabled and configured as follows.
+Modify VES Test Collector config file to point to existing log directory and
+schema file:
.. code:: bash
- LoadPlugin virt
+ $ sed -i.back 's/^\(log_file[ ]*=[ ]*\).*/\1collector.log/' ~/evel-test-collector/config/collector.conf
+ $ sed -i.back 's/^\(schema_file[ ]*=.*\)event_format_updated.json$/\1CommonEventFormat.json/' ~/evel-test-collector/config/collector.conf
- <Plugin virt>
- Connection "qemu:///system"
- RefreshInterval 60
- HostnameFormat uuid
- PluginInstanceFormat name
- ExtraStats "cpu_util perf"
- </Plugin>
+Start VES Test Collector:
+.. code:: bash
-.. note:: For more detailed information on the `virt` plugin configuration,
- requirements etc., please see the userguide of the collectd virt plugin.
+ $ cd ~/evel-test-collector/code/collector
+ $ nohup python ./collector.py --config ../../config/collector.conf > collector.stdout.log &
+
+
+Setup VES application (guest mode)
+----------------------------------
-Please ensure that the cpu plugin is enabled and configured as follows
+Install dependencies:
.. code:: bash
- LoadPlugin cpu
+ $ sudo pip install pyyaml
- <Plugin cpu>
- ReportByCpu false
- ValuesPercentage true
- </Plugin>
+Clone Barometer repo:
+
+.. code:: bash
+
+ $ git clone https://gerrit.opnfv.org/gerrit/barometer ~/barometer
+ $ cd ~/barometer/3rd_party/collectd-ves-app/ves_app
+ $ nohup python ves_app.py --events-schema=guest.yaml --config=ves_app_config.conf > ves_app.stdout.log &
.. note::
- The ``ReportByCpu`` option should be set to `true` (default)
- if VES application is running on guest machine ('GuestRunning' = true).
+ The above configuration is used for a localhost. The VES application can be
+ configured to use remote real VES collector and remote Kafka server. To do
+ so, the IP addresses/host names needs to be changed in ``collector.conf``
+ and ``ves_app_config.conf`` files accordingly.
-Please ensure that the aggregation plugin is enabled and configured as follows
-(required if 'GuestRunning' = true)
-.. code:: bash
+Configure VES in host mode
+--------------------------
- LoadPlugin aggregation
+Running the VES in host mode looks like steps described in
+`Setup VES application (guest mode)`_ but with the following exceptions:
- <Plugin aggregation>
- <Aggregation>
- Plugin "cpu"
- Type "percent"
- GroupBy "Host"
- GroupBy "TypeInstance"
- SetPlugin "cpu-aggregation"
- CalculateAverage true
- </Aggregation>
- </Plugin>
+- The ``host.yaml`` configuration file should be used instead of ``guest.yaml``
+ file when VES application is running.
-If application is running on a guest side, it is important to enable uuid plugin
-too. In this case the hostname in event message will be represented as UUID
-instead of system host name.
+- Collectd should be running on host machine only.
-.. code:: bash
+- Addition ``libvirtd`` dependencies needs to be installed on a host where
+ collectd daemon is running. To install those dependencies, see :ref:`virt-plugin`
+ section of Barometer user guide.
- LoadPlugin uuid
+- At least one VM instance should be up and running by hypervisor on the host.
-If a custom UUID needs to be provided, the following configuration is required in collectd.conf
-file:
+- The next (minimum) configuration needs to be provided to collectd to be able
+ to generate the VES message to VES collector.
-.. code:: bash
+ .. include:: collectd-ves-host.conf
+ :code: bash
- <Plugin uuid>
- UUIDFile "/etc/uuid"
- </Plugin>
+ to apply this configuration, the ``/opt/collectd/etc/collectd.conf`` file
+ needs to be modified based on example above and collectd daemon needs to
+ be restarted using the command below:
-Where "/etc/uuid" is a file containing custom UUID.
+ .. code:: bash
-Please also ensure that the following plugins are enabled:
+ $ sudo systemctl restart collectd
-.. code:: bash
+.. note:: The list of the plugins can be extented depends on your needs.
- LoadPlugin disk
- LoadPlugin interface
- LoadPlugin memory
-VES application with collectd notifications example
----------------------------------------------------
+VES application configuration description
+-----------------------------------------
-A good example of collectD notification is monitoring of the total CPU usage on a VM
-using the 'threshold' plugin. The following configuration will setup VES plugin to send 'Fault'
-event every time a total VM CPU value is out of range (e.g.: WARNING: VM CPU TOTAL > 50%,
-CRITICAL: VM CPU TOTAL > 96%) and send 'Fault' NORMAL event if the CPU value is back
-to normal. In the example below, there is one VM with two CPUs configured which is running
-on the host with a total of 48 cores. Thus, the threshold value 2.08 (100/48) means that
-one CPU of the VM is fully loaded (e.g.: 50% of total CPU usage of the VM) and 4.0 means
-96% of total CPU usage of the VM. Those values can also be obtained by virt-top
-command line tool.
+**Details of the Vendor Event Listener REST service**
-.. code:: bash
+REST resources are defined with respect to a ``ServerRoot``::
+
+ ServerRoot = https://{Domain}:{Port}/{optionalRoutingPath}
+
+REST resources are of the form::
+
+ {ServerRoot}/eventListener/v{apiVersion}`
+ {ServerRoot}/eventListener/v{apiVersion}/{topicName}`
+ {ServerRoot}/eventListener/v{apiVersion}/eventBatch`
+
+Within the VES directory (``3rd_party/collectd-ves-app/ves_app``) there is a
+configuration file called ``ves_app.conf``. The description of the
+configuration options are described below:
+
+**Domain** *"host"*
+ VES domain name. It can be IP address or hostname of VES collector
+ (default: ``127.0.0.1``)
+
+**Port** *port*
+ VES port (default: ``30000``)
+
+**Path** *"path"*
+ Used as the "optionalRoutingPath" element in the REST path (default: empty)
+
+**Topic** *"path"*
+ Used as the "topicName" element in the REST path (default: empty)
+
+**UseHttps** *true|false*
+ Allow application to use HTTPS instead of HTTP (default: ``false``)
+
+**Username** *"username"*
+ VES collector user name (default: empty)
+
+**Password** *"passwd"*
+ VES collector password (default: empty)
+
+**SendEventInterval** *interval*
+ This configuration option controls how often (sec) collectd data is sent to
+ Vendor Event Listener (default: ``20``)
+
+**ApiVersion** *version*
+ Used as the "apiVersion" element in the REST path (default: ``5.1``)
+
+**KafkaPort** *port*
+ Kafka Port (Default ``9092``)
+
+**KafkaBroker** *host*
+ Kafka Broker domain name. It can be an IP address or hostname of local or remote server
+ (default: ``localhost``)
- LoadPlugin threshold
- <Plugin "threshold">
- <Plugin "virt">
- <Type "percent">
- WarningMax 2.08
- FailureMax 4.0
- Instance "virt_cpu_total"
- </Type>
- </Plugin>
- </Plugin>
+VES notification support
+------------------------
-More detailed information on how to configure collectD thresholds can be found at
-https://collectd.org/documentation/manpages/collectd-threshold.5.shtml
+The VES application already supports YAML notification definitions but due to
+the collectd Kafka plugin limitations, collectd notifications cannot be received
+by the VES application. Thus, the VES notification (defined by YAML) will not be
+generated and sent to VES collector.
diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
index 7d85953d..30e34b99 100644
--- a/docs/release/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
@@ -712,6 +712,7 @@ Then you can run the mcelog test suite with
This will inject different classes of errors and check that the mcelog triggers
runs. There will be some kernel messages about page offlining attempts. The
test will also lose a few pages of memory in your system (not significant).
+
.. note::
This test will kill any running mcelog, which needs to be restarted
manually afterwards.
@@ -1036,6 +1037,8 @@ https://github.com/maryamtahhan/collectd/blob/feat_snmp/src/collectd.conf.pod
For more details on AgentX subagent, please see:
http://www.net-snmp.org/tutorial/tutorial-5/toolkit/demon/
+.. _virt-plugin:
+
virt plugin
^^^^^^^^^^^^
Repo: https://github.com/maryamtahhan/collectd
@@ -1171,6 +1174,8 @@ statistics are disabled. They can be enabled with ``ExtraStats`` option.
For more information on the plugin parameters, please see:
https://github.com/maryamtahhan/collectd/blob/feat_libvirt_upstream/src/collectd.conf.pod
+.. _install-collectd-as-a-service:
+
Installing collectd as a service
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
**NOTE**: In an OPNFV installation, collectd is installed and configured as a
@@ -1207,9 +1212,9 @@ Reload
Additional useful plugins
^^^^^^^^^^^^^^^^^^^^^^^^^^
-* **Exec Plugin** : Can be used to show you when notifications are being
- generated by calling a bash script that dumps notifications to file. (handy
- for debug). Modify /opt/collectd/etc/collectd.conf:
+**Exec Plugin** : Can be used to show you when notifications are being
+generated by calling a bash script that dumps notifications to file. (handy
+for debug). Modify /opt/collectd/etc/collectd.conf:
.. code:: bash
diff --git a/src/Makefile b/src/Makefile
index e7a472c1..4785e854 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -32,9 +32,12 @@ $(SUBBUILDS):
with-dpdk:
export WITH_DPDK
+
include mk/master.mk
SUBDIRS =
+ifdef WITH_DPDK
SUBDIRS += dpdk
+endif
SUBDIRS += libpqos
SUBDIRS += pmu-tools
SUBDIRS += collectd
diff --git a/src/collectd/Makefile b/src/collectd/Makefile
index b7fc2a15..e09aca3b 100644
--- a/src/collectd/Makefile
+++ b/src/collectd/Makefile
@@ -52,7 +52,7 @@ CONFIG_CMD += --disable-perl
.PHONY: install force_install config force_make
# install depends on make
-#force_install: force_make
+force_install: force_make
all: force_make
@echo "Finished making $(WORK_DIR)"
diff --git a/src/collectd/collectd_sample_configs/intel_pmu.conf b/src/collectd/collectd_sample_configs/intel_pmu.conf
new file mode 100644
index 00000000..db83e4bb
--- /dev/null
+++ b/src/collectd/collectd_sample_configs/intel_pmu.conf
@@ -0,0 +1,22 @@
+# Copyright 2017 OPNFV
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+LoadPlugin intel_pmu
+
+<Plugin intel_pmu>
+ ReportHardwareCacheEvents true
+ ReportKernelPMUEvents true
+ ReportSoftwareEvents true
+# EventList "/var/cache/pmu/GenuineIntel-6-2D-core.json"
+# HardwareEvents "L2_RQSTS.CODE_RD_HIT,L2_RQSTS.CODE_RD_MISS" "L2_RQSTS.ALL_CODE_RD"
+</Plugin>
diff --git a/src/collectd/collectd_sample_configs/mcelog.conf b/src/collectd/collectd_sample_configs/mcelog.conf
index 649573dc..3e28f3f1 100644
--- a/src/collectd/collectd_sample_configs/mcelog.conf
+++ b/src/collectd/collectd_sample_configs/mcelog.conf
@@ -16,5 +16,10 @@
</LoadPlugin>
<Plugin mcelog>
+ <Memory>
McelogClientSocket "/var/run/mcelog-client"
+ PersistentNotification false
+ </Memory>
+## McelogLogfile "/var/log/mcelog"
</Plugin>
+
diff --git a/src/collectd/snmp_mib_config.sh b/src/collectd/snmp_mib_config.sh
index 179eb4ba..a2c44db1 100755
--- a/src/collectd/snmp_mib_config.sh
+++ b/src/collectd/snmp_mib_config.sh
@@ -17,8 +17,14 @@ export CURRENT_DIR=$(pwd)
cp $CURRENT_DIR/../../mibs/* /usr/share/snmp/mibs/
-if [ -n "$(uname -a | grep Ubuntu)" ]; then
+# Detect OS name and version from systemd based os-release file
+. /etc/os-release
+
+# Get OS name (the First word from $NAME in /etc/os-release)
+OS_NAME="$ID"
+
+if [ "x$OS_NAME" == "xubuntu" ]; then
cp $CURRENT_DIR/../../mibs/* /var/lib/mibs/ietf/
-else
+elif [ "x${OS_NAME}" == "xfedora" ]; then
cp $CURRENT_DIR/../../mibs/* /usr/share/mibs/ietf/
fi
diff --git a/src/pmu-tools/Makefile b/src/pmu-tools/Makefile
index e40521f5..6d080d70 100644
--- a/src/pmu-tools/Makefile
+++ b/src/pmu-tools/Makefile
@@ -22,7 +22,7 @@
include ../mk/master.mk
include ../package-list.mk
-
+export XDG_CACHE_HOME=/usr/local/src
WORK_DIR = pmu-tools
TAG_DONE_FLAG = $(WORK_DIR)/.$(PMUTOOLS_TAG).done
BUILD_CMD =
@@ -42,7 +42,8 @@ force_make: $(WORK_DIR) $(TAG_DONE_FLAG)
$(AT)cd $(WORK_DIR) && git pull $(PMUTOOLS_URL) $(PMUTOOLS_TAG)
@echo "git pull done"
$(AT)cd $(WORK_DIR)/jevents
- $(AT)sed -i 's/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/CFLAGS += -g -Wall -O2 -Wno-unused-result -fPIC/' $(MAKEFILE)
+ $(AT)sed -i 's/lib64/lib/' $(WORK_DIR)/jevents/$(MAKEFILE)
+ $(AT)sed -i 's/CFLAGS := -g -Wall -O2 -Wno-unused-result/CFLAGS := -g -Wall -O2 -Wno-unused-result -fPIC/' $(WORK_DIR)/jevents/$(MAKEFILE)
$(AT)$(MAKE) -C $(WORK_DIR)/jevents
@echo "Make done"
diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index 2537f958..a50baf2d 100755
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -58,7 +58,7 @@ distro_dir="$OS_NAME/$VERSION_ID"
if [ -d "$distro_dir" ] && [ -e "$distro_dir/build_base_machine.sh" ]; then
$SUDO $distro_dir/build_base_machine.sh || die "$distro_dir/build_base_machine.sh failed"
else
- die "$distro_dir is not yet supported"
+ die "$distro_dir is not supported"
fi
if [ ! -d /lib/modules/`uname -r`/build ] ; then
@@ -69,7 +69,6 @@ fi
if [ -f ../src/Makefile ] ; then
cd ../src
make clobber || die "Make clobber failed"
- make || die "Make failed"
make install || die "Make install failed"
cd -
else
diff --git a/systems/ubuntu/14.04/build_base_machine.sh b/systems/ubuntu/14.04/build_base_machine.sh
deleted file mode 100755
index 4f62f302..00000000
--- a/systems/ubuntu/14.04/build_base_machine.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/bash
-# Copyright 2016-2017 OPNFV
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-set -eux
-apt-get update
-apt-get -y install build-essential dh-autoreconf fakeroot devscripts dpkg-dev git wget
-
-apt-get -y install \
- debhelper dpkg-dev po-debconf dh-systemd \
- bison flex autotools-dev libltdl-dev pkg-config \
- iptables-dev \
- javahelper \
- libatasmart-dev \
- libcap-dev \
- libcurl4-gnutls-dev \
- libdbi-dev \
- libesmtp-dev \
- libganglia1-dev \
- libgcrypt11-dev \
- libglib2.0-dev \
- libgps-dev \
- libhiredis-dev \
- libi2c-dev \
- libldap2-dev \
- liblua5.2-dev \
- liblvm2-dev \
- libmemcached-dev \
- libmodbus-dev \
- libmnl-dev \
- libmosquitto0-dev \
- libmysqlclient-dev \
- libnotify-dev \
- libopenipmi-dev \
- liboping-dev \
- libow-dev \
- libpcap0.8-dev \
- libpcap-dev\
- libperl-dev \
- libpq-dev \
- libprotobuf-c0-dev \
- libriemann-client-dev \
- librdkafka-dev \
- librabbitmq-dev \
- librrd-dev \
- libsensors4-dev \
- libsigrok-dev \
- libsnmp-dev \
- snmp \
- snmp-mibs-downloader \
- snmpd \
- perl \
- libtokyocabinet-dev \
- libtokyotyrant-dev \
- libudev-dev \
- libupsclient-dev \
- libvarnishapi-dev \
- libvirt-dev \
- libvirt-daemon \
- libxen-dev \
- libxml2-dev \
- libyajl-dev \
- linux-libc-dev \
- default-jdk \
- protobuf-c-compiler \
- python-dev \
- openvswitch-switch \
- mcelog \
- libc6-dev \
- g++-multilib
-