openstack/devstack
Code Issues Proposed changes

run swift blocks if any services are enabled

Browse Source 
Previously the swift blocks only ran if s-proxy is enabled, which
prevents a multinode configuration. We should run these blocks if any
swift services are enabled, and push proxy specific conditionals one
step lower.

Change-Id: I540a97615b3c19f882c8673b1a4a29cd47e36aa8
This commit is contained in:
Sean Dague 2016-03-25 08:58:54 -04:00
parent 74d82d9343
commit 8b416ae821
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stack.sh
View File

@ -799,7 +799,7 @@ if is_service_enabled keystone; then
fi fi
fi fi
if is_service_enabled s-proxy; then if is_service_enabled swift; then
if is_service_enabled ceilometer; then if is_service_enabled ceilometer; then
install_ceilometermiddleware install_ceilometermiddleware
fi fi
@ -1118,7 +1118,7 @@ fi
# Storage Service # Storage Service
# --------------- # ---------------
if is_service_enabled s-proxy; then if is_service_enabled swift; then
echo_summary "Configuring Swift" echo_summary "Configuring Swift"
init_swift init_swift
fi fi
@ -1172,7 +1172,7 @@ merge_config_group $TOP_DIR/local.conf post-config
# Only run the services specified in ``ENABLED_SERVICES`` # Only run the services specified in ``ENABLED_SERVICES``
# Launch Swift Services # Launch Swift Services
if is_service_enabled s-proxy; then if is_service_enabled swift; then
echo_summary "Starting Swift" echo_summary "Starting Swift"
start_swift start_swift
fi fi