commit f3da41a5eea19f429a296405bfa3b72d899c3141
author Jenkins <jenkins@review.openstack.org> Sat Feb 02 13:30:16 2013 +0000
committer Gerrit Code Review <review@openstack.org> Sat Feb 02 13:30:16 2013 +0000
tree d9bbfbff3b9590f27597a8a98fcf832704543e2f
parent 9da83af25229f112644076a692b41a5e3494d3ff
parent 4196d5565e48608c64fccdd9e17fcc01dd8d06fe

Merge "Introduce get_python_exec_prefix function."

functions

diff --git a/functions b/functions
index 7948378..68aec5d 100644
--- a/functions
+++ b/functions
@@ -1110,17 +1110,23 @@
 }
 
 
+# Get the path to the direcotry where python executables are installed.
+# get_python_exec_prefix
+function get_python_exec_prefix() {
+    if is_fedora; then
+        echo "/usr/bin"
+    else
+        echo "/usr/local/bin"
+    fi
+}
+
 # Get the location of the $module-rootwrap executables, where module is cinder
 # or nova.
 # get_rootwrap_location module
 function get_rootwrap_location() {
     local module=$1
 
-    if is_fedora; then
-        echo "/usr/bin/$module-rootwrap"
-    else
-        echo "/usr/local/bin/$module-rootwrap"
-    fi
+    echo "$(get_python_exec_prefix)/$module-rootwrap"
 }
 
 # Get the path to the pip command.

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 0fae397..41a5f53 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -40,7 +40,7 @@
 if [ -d $CEILOMETER_DIR/bin ] ; then
     CEILOMETER_BIN_DIR=$CEILOMETER_DIR/bin
 else
-    CEILOMETER_BIN_DIR=/usr/local/bin
+    CEILOMETER_BIN_DIR=$(get_python_exec_prefix)
 fi
 
 # cleanup_ceilometer() - Remove residual data files, anything left over from previous

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index 014fefa..fd5f8cf 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -47,7 +47,7 @@
 if [[ -d $CINDER_DIR/bin ]]; then
     CINDER_BIN_DIR=$CINDER_DIR/bin
 else
-    CINDER_BIN_DIR=/usr/local/bin
+    CINDER_BIN_DIR=$(get_python_exec_prefix)
 fi
 
 # Name of the lvm volume group to use/create for iscsi volumes

lib/glance

diff --git a/lib/glance b/lib/glance
index 1c56a67..5d48129 100644
--- a/lib/glance
+++ b/lib/glance
@@ -44,7 +44,7 @@
 if [[ -d $GLANCE_DIR/bin ]]; then
     GLANCE_BIN_DIR=$GLANCE_DIR/bin
 else
-    GLANCE_BIN_DIR=/usr/local/bin
+    GLANCE_BIN_DIR=$(get_python_exec_prefix)
 fi
 
 # Glance connection info.  Note the port must be specified.

lib/nova

diff --git a/lib/nova b/lib/nova
index 6cf5a5d..1681af7 100644
--- a/lib/nova
+++ b/lib/nova
@@ -49,7 +49,7 @@
 if [[ -d $NOVA_DIR/bin ]]; then
     NOVA_BIN_DIR=$NOVA_DIR/bin
 else
-    NOVA_BIN_DIR=/usr/local/bin
+    NOVA_BIN_DIR=$(get_python_exec_prefix)
 fi
 
 # Set the paths of certain binaries