summaryrefslogtreecommitdiffstats
path: root/bootstrap/vagrant-onap/lib/commons
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2017-11-06 09:20:27 -0800
committerVictor Morales <victor.morales@intel.com>2017-11-06 09:20:27 -0800
commit7abf1a8ea14252fa55bf7da0575ad0ff21f41d61 (patch)
treefe63005167be86de8847bf6b85b7de7619ecda6a /bootstrap/vagrant-onap/lib/commons
parent2f75a72c8955a1dcf5aa367162a19bddb5eded2a (diff)
Add debug support
This change allows to control the level of verbosity for the ONAP on vagrant execution. The new debug configuration value enables verbosity setting its value to *True* Change-Id: I29a3694ea3182a02cb585af5ae8ada1f8a415c8c Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-Id: INT-323
Diffstat (limited to 'bootstrap/vagrant-onap/lib/commons')
-rwxr-xr-xbootstrap/vagrant-onap/lib/commons30
1 files changed, 13 insertions, 17 deletions
diff --git a/bootstrap/vagrant-onap/lib/commons b/bootstrap/vagrant-onap/lib/commons
index 26e2cc26a..ba7c7613a 100755
--- a/bootstrap/vagrant-onap/lib/commons
+++ b/bootstrap/vagrant-onap/lib/commons
@@ -1,26 +1,16 @@
#!/bin/bash
-set -o xtrace
-
# update_repos() - Function that updates linux repositories
function update_repos {
+ echo "Updating repositories list..."
if [ -f /var/onap/files/sources.list ]; then
cp /var/onap/files/sources.list /etc/apt/sources.list
fi
- if [ -f /var/onap/files/proxyrc ]; then
- source /var/onap/files/proxyrc
- cp /var/onap/files/proxyrc /etc/profile.d/proxy.sh
-
- if [ -f /etc/apt/apt.conf ]; then
- echo "Acquire::http::Proxy \"${http_proxy}\";" >> /etc/apt/apt.conf
- echo "Acquire::https::Proxy \"${https_proxy}\";" >> /etc/apt/apt.conf
- fi
- if [ -d /etc/apt/apt.conf.d ] & [ ! -f /etc/apt/apt.conf.d/70proxy.conf ]; then
- echo "Acquire::http::Proxy \"${http_proxy}\";" >> /etc/apt/apt.conf.d/70proxy.conf
- echo "Acquire::https::Proxy \"${https_proxy}\";" >> /etc/apt/apt.conf.d/70proxy.conf
- fi
+ if [[ "$debug" == "False" ]]; then
+ apt-get update > /dev/null
+ else
+ apt-get update
fi
- apt-get update -qq -y
}
# is_package_installed() - Function to tell if a package is installed
@@ -41,9 +31,15 @@ function install_packages {
# install_package() - Install specific package if doesn't exist
function install_package {
local package=$1
+
if ! is_package_installed $package; then
- update_repos
- apt-get install -y -qq $package
+ echo "Installing $package..."
+
+ if [[ "$debug" == "False" ]]; then
+ apt-get install -y -qq -o=Dpkg::Use-Pty=0 $package
+ else
+ apt-get install -y $package
+ fi
fi
}