Browse code

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

Ian Wienand authored on 2013/06/06 10:19:16
Showing 1 changed files
... ...
@@ -441,6 +441,12 @@ function create_nova_conf() {
441 441
     iniset $NOVA_CONF DEFAULT instance_name_template "${INSTANCE_NAME_PREFIX}%08x"
442 442
     iniset $NOVA_CONF DEFAULT osapi_v3_enabled "True"
443 443
 
444
+    if is_fedora; then
445
+        # nova defaults to /usr/local/bin, but fedora pip likes to
446
+        # install things in /usr/bin
447
+        iniset $NOVA_CONF DEFAULT bindir "/usr/bin"
448
+    fi
449
+
444 450
     if is_service_enabled n-api; then
445 451
         iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"
446 452
         if is_service_enabled tls-proxy; then