From a34d377fb29f45559b3f63696039ecf7f3c3c741 Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla-mota@hp.com>
Date: Fri, 24 Oct 2014 11:25:03 +0200
Subject: [PATCH] Add is_debian and uses_debs functions

Create a new is_debian method to check for Debian
distro. Create an uses_debs function and use
it in the same cases as Ubuntu to support Debian
distros in tests. Also keeping the is_ubuntu and
is_debian methods for some special cases if needed.

Change-Id: Id30cdb9bc94591a957d6f77be84e077a0adad7d9
---
 devstack-vm-gate.sh |  2 +-
 functions.sh        | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 12e2aca0..306fe0ea 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -49,7 +49,7 @@ function setup_localrc {
     fi
 
     # Install PyYaml for test-matrix.py
-    if is_ubuntu; then
+    if uses_debs; then
         sudo apt-get update
         sudo apt-get install python-yaml
     elif is_fedora; then
diff --git a/functions.sh b/functions.sh
index 69ae24ee..259ca12d 100644
--- a/functions.sh
+++ b/functions.sh
@@ -27,6 +27,15 @@ function is_ubuntu {
     lsb_release -i 2>/dev/null | grep -iq "ubuntu"
 }
 
+function is_debian {
+    # do not rely on lsb_release because it may be not installed by default
+    cat /etc/*-release | grep ID 2>/dev/null | grep -iq "debian"
+}
+
+function uses_debs {
+    # check if apt-get is installed, valid for debian based
+    type "apt-get" 2>/dev/null
+}
 
 function function_exists {
     type $1 2>/dev/null | grep -q 'is a function'
@@ -91,7 +100,7 @@ function start_timer {
     # 4 hrs (which has happened)
     if is_fedora; then
         local ntp_service='ntpd'
-    elif is_ubuntu; then
+    elif uses_debs; then
         local ntp_service='ntp'
     else
         echo "Unsupported platform, can't determine ntp service"
@@ -403,7 +412,7 @@ function setup_host {
     sudo mkdir -p $BASE
 
     # Start with a fresh syslog
-    if is_ubuntu; then
+    if uses_debs; then
         sudo stop rsyslog
         sudo mv /var/log/syslog /var/log/syslog-pre-devstack
         sudo mv /var/log/kern.log /var/log/kern_log-pre-devstack
@@ -477,7 +486,7 @@ function cleanup_host {
     sleep 2
 
     # No matter what, archive logs and config files
-    if is_ubuntu; then
+    if uses_debs; then
         sudo cp /var/log/syslog $BASE/logs/syslog.txt
         sudo cp /var/log/kern.log $BASE/logs/kern_log.txt
     elif is_fedora; then
@@ -489,7 +498,7 @@ function cleanup_host {
     fi
 
     # apache logs; including wsgi stuff like horizon, keystone, etc.
-    if is_ubuntu; then
+    if uses_debs; then
         local apache_logs=/var/log/apache2
     elif is_fedora; then
         local apache_logs=/var/log/httpd
@@ -534,7 +543,7 @@ function cleanup_host {
 
     # Archive Apache config files
     sudo mkdir $BASE/logs/apache_config
-    if is_ubuntu; then
+    if uses_debs; then
         if [[ -d /etc/apache2/sites-enabled ]]; then
             sudo cp /etc/apache2/sites-enabled/* $BASE/logs/apache_config
         fi