Browse code

Merge "Use nova bindir of /usr/bin on Fedora"

Jenkins authored on 2013/06/07 06:57:21
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