X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fbaseline.sh;h=aae30d44b1e3be34881adf56e5646a8ef1fedde7;hb=70ceace4eaa326b6ddf0af903a65e21987bf1d86;hp=6694538f37d1e1c7e5568386b455450b261ad6e4;hpb=fa898e13f12480e25ecb182eae1ce627c1437551;p=releng%2Fbuilder.git

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 6694538f3..aae30d44b 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -7,17 +7,19 @@ set -xeu -o pipefail
 
 enable_service() {
     # Enable services for Ubuntu instances
+    # We purposely want to allow globbing to build the package array
+    # shellcheck disable=SC2206
     services=($@)
 
     for service in "${services[@]}"; do
         echo "---> Enable service: $service"
-        FACTER_OS=$(/usr/bin/facter operatingsystem)
+        FACTER_OS=$(/usr/bin/facter operatingsystem | tr '[:upper:]' '[:lower:]')
         FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
-        if [ "$FACTER_OS" == "CentOS" ]; then
+        if [ "$FACTER_OS" == "centos" ]; then
             systemctl enable "$service"
             systemctl start "$service"
             systemctl status "$service"
-        elif [ "$FACTER_OS" == "Ubuntu" ]; then
+        elif [ "$FACTER_OS" == "ubuntu" ]; then
             case "$FACTER_OSVER" in
                 14.04)
                     service "$service" start
@@ -72,6 +74,8 @@ ensure_ubuntu_install() {
     # On Ubuntu sometimes the mirrors fail to install a package. This wrapper
     # checks that a package is successfully installed before moving on.
 
+    # We purposely want to allow globbing to build the package array
+    # shellcheck disable=SC2206
     packages=($@)
 
     for pkg in "${packages[@]}"
@@ -79,6 +83,10 @@ ensure_ubuntu_install() {
         # Retry installing package 5 times if necessary
         for i in {0..5}
         do
+
+            # Wait for any background apt processes to finish before running apt
+            while pgrep apt > /dev/null; do sleep 1; done
+
             echo "$i: Installing $pkg"
             if [ "$(dpkg-query -W -f='${Status}' "$pkg" 2>/dev/null | grep -c "ok installed")" -eq 0 ]; then
                 apt-cache policy "$pkg"
@@ -172,10 +180,10 @@ EOF
     echo "---> Configuring OpenJDK"
     yum install -y 'java-*-openjdk-devel'
 
-    FACTER_OS=$(/usr/bin/facter operatingsystem)
+    FACTER_OS=$(/usr/bin/facter operatingsystem | tr '[:upper:]' '[:lower:]')
     FACTER_OSVER=$(/usr/bin/facter operatingsystemrelease)
     case "$FACTER_OS" in
-        Fedora)
+        fedora)
             if [ "$FACTER_OSVER" -ge "21" ]
             then
                 echo "---> not modifying java alternatives as OpenJDK 1.7.0 does not exist"
@@ -184,7 +192,7 @@ EOF
                 alternatives --set java_sdk_openjdk /usr/lib/jvm/java-1.7.0-openjdk.x86_64
             fi
         ;;
-        RedHat|CentOS)
+        redhat|centos)
             if [ "$(echo "$FACTER_OSVER" | cut -d'.' -f1)" -ge "7" ]
             then
                 echo "---> not modifying java alternatives as OpenJDK 1.7.0 does not exist"
@@ -277,9 +285,6 @@ Dpkg::Options {
 
 EOF
 
-    # Add hostname to /etc/hosts to fix 'unable to resolve host' issue with sudo
-    sed -i "/127.0.0.1/s/$/ $(hostname)/" /etc/hosts
-
     echo "---> Updating operating system"
 
     # add additional repositories
@@ -421,9 +426,9 @@ all_systems() {
 
     # Do any Distro specific installations here
     echo "Checking distribution"
-    FACTER_OS=$(/usr/bin/facter operatingsystem)
+    FACTER_OS=$(/usr/bin/facter operatingsystem | tr '[:upper:]' '[:lower:]')
     case "$FACTER_OS" in
-        RedHat|CentOS)
+        redhat|centos)
             if [ "$(/usr/bin/facter operatingsystemrelease | /bin/cut -d '.' -f1)" = "7" ]; then
                 echo
                 echo "---> CentOS 7"
@@ -440,6 +445,11 @@ all_systems() {
             echo "No extra steps for $FACTER_OS"
         ;;
     esac
+
+    # Update /etc/nss-switch.conf to map hostname with IP instead of using `localhost`
+    # from /etc/hosts which is required by some of the Java API's to avoid
+    # Java UnknownHostException: "Name or service not known" error.
+    sed -i "/^hosts:/s/$/ myhostname/" /etc/nsswitch.conf
 }
 
 echo "---> Attempting to detect OS"