openstack/devstack
Code Issues Proposed changes

Use nova bindir of /usr/bin on Fedora

Browse Source 
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
This commit is contained in:
Ian Wienand
2013-06-06 11:19:16 +10:00
parent cc8f47dca5
commit 00fd79d324
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/nova
View File

@@ -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