openstack/devstack
Code Issues Proposed changes

Move remove_uwsgi_config to cleanup_placement

Browse Source 
It had been in stop_placement, but we don't want it there: the old
side of grenade needs to call that but should not remove the uwsgi
configuration when doing so. It is configuration, after all.

Change-Id: Iee763adf7895145d97b184924896db3f1f48a015
Partial-Bug: #1736385
This commit is contained in:
Chris Dent 2017-12-05 23:46:58 +00:00
parent d576620e33
commit 1489b9e710
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/placement
View File

@ -71,6 +71,7 @@ function is_placement_enabled {
function cleanup_placement { function cleanup_placement {
sudo rm -f $(apache_site_config_for nova-placement-api) sudo rm -f $(apache_site_config_for nova-placement-api)
sudo rm -f $(apache_site_config_for placement-api) sudo rm -f $(apache_site_config_for placement-api)
remove_uwsgi_config "$PLACEMENT_UWSGI_CONF" "$PLACEMENT_UWSGI"
} }
# _config_placement_apache_wsgi() - Set WSGI config files # _config_placement_apache_wsgi() - Set WSGI config files
@ -188,7 +189,6 @@ function start_placement {
function stop_placement { function stop_placement {
if [[ "$WSGI_MODE" == "uwsgi" ]]; then if [[ "$WSGI_MODE" == "uwsgi" ]]; then
stop_process "placement-api" stop_process "placement-api"
remove_uwsgi_config "$PLACEMENT_UWSGI_CONF" "$PLACEMENT_UWSGI"
else else
disable_apache_site placement-api disable_apache_site placement-api
restart_apache_server restart_apache_server