From: Jeff Peeler <jpeeler@redhat.com>
Date: Tue, 5 Feb 2013 05:24:21 +0000 (-0500)
Subject: Fix a few bash logic errors in install script
X-Git-Tag: 2014.1~934
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=90bcc70a57f89e55a0af7775c71e6e0c5cd215b7;p=openstack-build%2Fheat-build.git

Fix a few bash logic errors in install script

Slipped by in 0a37f56972714818fcf378945b0d3b91d1b8e10a

Change-Id: Id02454e8224f99b057cc8c9e92580ae6c26bc14e
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
---

diff --git a/tools/openstack b/tools/openstack
index 4098487a..2fa187f4 100755
--- a/tools/openstack
+++ b/tools/openstack
@@ -27,7 +27,7 @@ else
     with_cinder=0
 fi
 
-if [[ `lsb_release -sr` -gt 17 || $with_cinder ]]; then
+if [[ `lsb_release -sr` -gt 17 || $with_cinder -eq 1 ]]; then
     VOLUME_SERVICE="openstack-cinder"
     VOLUME_PATH="/var/lib/cinder/cinder-volumes.img"
     VOLUME_NAME="cinder-volumes"
@@ -264,7 +264,7 @@ EOF
     sudo rm -rf /var/log/{glance,nova,swift,keystone,cinder}/*
     os_start
     sleep 1
-    if [[ $VOLUME_SERVICE -eq "openstack-cinder" ]]; then
+    if [[ $VOLUME_SERVICE == "openstack-cinder" ]]; then
         ${BASE_DIR}/../bin/cinder-keystone-setup
     fi
     echo "Installation Complete."