openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2013-06-06 21:57:21 +00:00 committed by Gerrit Code Review
commit 59756ac894
1 changed files with 6 additions and 0 deletions
Show Stats 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 instance_name_template "${INSTANCE_NAME_PREFIX}%08x"
iniset $NOVA_CONF DEFAULT osapi_v3_enabled "True" 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 if is_service_enabled n-api; then
iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS" iniset $NOVA_CONF DEFAULT enabled_apis "$NOVA_ENABLED_APIS"
if is_service_enabled tls-proxy; then if is_service_enabled tls-proxy; then