Merge "userguide: update barometer build and install"

diff --git a/docs/release/userguide/feature.userguide.rst b/docs/release/userguide/feature.userguide.rst
index c1463e7..3bda303 100644 (file)
--- a/docs/release/userguide/feature.userguide.rst
+++ b/docs/release/userguide/feature.userguide.rst
@@ -106,17 +106,11 @@ To build and install these dependencies, clone the barometer repo:
 
     $ git clone https://gerrit.opnfv.org/gerrit/barometer
 
-Install the build dependencies
-
-.. code:: bash
-
-    $ ./src/install_build_deps.sh
-
 To install collectd as a service and install all it's dependencies:
 
 .. code:: bash
 
-    $ cd barometer/src && sudo make && sudo make install
+    $ cd barometer && ./systems/build_base_machine.sh
 
 This will install collectd as a service and the base install directory
 will be /opt/collectd.

diff --git a/systems/build_base_machine.sh b/systems/build_base_machine.sh
index f6f72b7..7b877f5 100755 (executable)
--- a/systems/build_base_machine.sh
+++ b/systems/build_base_machine.sh
@@ -46,14 +46,14 @@ then
     SUDO="sudo -E"
 fi
 
-# If there is version specific dir available then set distro_dir to that
-if [ -d "$OS_NAME/$VERSION_ID" ]; then
-    distro_dir="$OS_NAME/$VERSION_ID"
-else
-    # Fallback - Default distro_dir = OS name
-    distro_dir="$OS_NAME"
+if [ "$1" != "-f" ] && [ -d "/opt/collectd" ] || [ -d "/etc/collectd" ]
+then
+    die "collectd is already installed on this system, if you wish to reinstall please rerun the script with a -f argument"
 fi
 
+# If there is version specific dir available then set distro_dir to that
+distro_dir="$OS_NAME/$VERSION_ID"
+
 # build base system using OS specific scripts
 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"

diff --git a/systems/ubuntu/16.04/build_base_machine.sh b/systems/ubuntu/16.04/build_base_machine.sh
new file mode 100755 (executable)
index 0000000..440b3e7
--- /dev/null
+++ b/systems/ubuntu/16.04/build_base_machine.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+#
+# Build a base machine for Ubuntu 16.04
+#
+# Copyright 2015-2017 OPNFV, Intel Corporation.
+#
+# 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.
+#
+# Contributors:
+#   Aihua Li, Huawei Technologies.
+#   Martin Klozik, Intel Corporation.
+#   Abdul Halim, Intel Corporation.
+
+apt-get update
+apt-get -y install $(echo "
+# Make and Compilers
+make
+automake
+gcc
+g++
+libc6
+libc6-dev
+
+# Linux Kernel Source
+linux-source
+linux-headers-$(uname -r)
+pkg-config
+
+# tools
+curl
+libcurl4-openssl-dev
+automake
+autoconf
+libtool
+libpcap-dev
+libnet1
+libncurses5-dev
+vim
+wget
+git
+pciutils
+cifs-utils
+socat
+libpixman-1-0
+libpixman-1-dev
+
+# install git-review tool
+git-review
+" | grep -v ^#)