From 00fd79d324283882c23059f1e12906d413b0a64f Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 6 Jun 2013 11:19:16 +1000
Subject: [PATCH] Use nova bindir of /usr/bin on Fedora

Fedora (and RHEL) like to install things in /usr/bin, e.g.

 01:30:42 Creating /usr/lib/python2.7/site-packages/nova.egg-link (link to .)
 01:30:42 Adding nova 2013.2.a1031.gfc5137d to easy-install.pth file
 01:30:42 Installing nova-dhcpbridge script to /usr/bin
 ...

The default nova/paths.py defaults to /usr/local/... which causes
quite a few errors when stressing various parts of nova and tools
aren't found.

Change-Id: Iaa93af96ddfb4deb6d16ea1dcac25ae6ed1e317d
---
 lib/nova | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/nova b/lib/nova
index 809f56c648..be526cfdb8 100644
--- a/lib/nova
+++ b/lib/nova
@@ -441,6 +441,12 @@ function create_nova_conf() {
     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"
     iniset $NOVA_CONF DEFAULT osapi_v3_enabled "True"
 
+    if is_fedora; then
+        # nova defaults to /usr/local/bin, but fedora pip likes to
+        # install things in /usr/bin
+        iniset $NOVA_CONF DEFAULT bindir "/usr/bin"
+    fi
+
     if is_service_enabled n-api; then
         iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"
         if is_service_enabled tls-proxy; then