Make facter OS output case insensitive

Update provisioning scripts to handle the output returned
from facter command, should be made case insensitive.

Change-Id: I9fdca69cf44ff64fa9f6386f627231c6b9ff39a5
Jira: releng-202
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index 6694538f37d1e1c7e5568386b455450b261ad6e4..2fa3473766d0aa1316776b60be5c0716141625e6 100644 (file)
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -11,13 +11,13 @@ enable_service() {
 
     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
@@ -172,10 +172,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 +184,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"
@@ -421,9 +421,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"

diff --git a/packer/provision/docker.sh b/packer/provision/docker.sh
index d476f6687e4a2d6aa9b95755a0d3f92da38db1e1..12814a6f213bccc1304aa95c1c227d6457b78a7b 100644 (file)
--- a/packer/provision/docker.sh
+++ b/packer/provision/docker.sh
@@ -33,12 +33,12 @@ ubuntu_changes() {
     echo "---> Ubuntu changes"
 }
 
-OS=$(/usr/bin/facter operatingsystem)
+OS=$(/usr/bin/facter operatingsystem | tr '[:upper:]' '[:lower:]')
 case "$OS" in
-    CentOS|Fedora|RedHat)
+    centos|fedora|redhat)
         rh_changes
     ;;
-    Ubuntu)
+    ubuntu)
         ubuntu_changes
     ;;
     *)