Merge branch 'master' of github.com:d3llf/devstack

Kamil Izdebski · Kamil Izdebski · commit aa321c25e61d · 2012-10-31T01:12:23.000+01:00
Conflicts:
	functions
Resolved from os builder.
diff --git a/functions b/functions
@@ -631,7 +631,7 @@ function restart_service() {
     elif [[ "$os_PACKAGE" = "rpm" ]]; then
         sudo /sbin/service $1 restart
     elif [[ "$os_PACKAGE" = "ebuild" ]]; then
-    	sudo rc-service $1 restart
+        sudo /sbin/rc-service $1 restart
     fi
 }
 
diff --git a/lib/cinder b/lib/cinder
@@ -170,7 +170,7 @@ function init_cinder() {
         mkdir -p $CINDER_STATE_PATH/volumes
 
         if sudo vgs $VOLUME_GROUP; then
-            if [[ ${os_PACKAGE} = (rpm|ebuild) ]]; then
+            if [[ ${os_PACKAGE} =~ (rpm|ebuild) ]]; then
                 # RPM nor Gentoo doesn't start the service
                 start_service tgtd
             fi
