Browse code
Move remove_uwsgi_config to cleanup_placement
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
Chris Dent authored on 2017/12/06 08:46:58Showing 1 changed files
| ... | ... |
@@ -71,6 +71,7 @@ function is_placement_enabled {
|
| 71 | 71 |
function cleanup_placement {
|
| 72 | 72 |
sudo rm -f $(apache_site_config_for nova-placement-api) |
| 73 | 73 |
sudo rm -f $(apache_site_config_for placement-api) |
| 74 |
+ remove_uwsgi_config "$PLACEMENT_UWSGI_CONF" "$PLACEMENT_UWSGI" |
|
| 74 | 75 |
} |
| 75 | 76 |
|
| 76 | 77 |
# _config_placement_apache_wsgi() - Set WSGI config files |
| ... | ... |
@@ -188,7 +189,6 @@ function start_placement {
|
| 188 | 188 |
function stop_placement {
|
| 189 | 189 |
if [[ "$WSGI_MODE" == "uwsgi" ]]; then |
| 190 | 190 |
stop_process "placement-api" |
| 191 |
- remove_uwsgi_config "$PLACEMENT_UWSGI_CONF" "$PLACEMENT_UWSGI" |
|
| 192 | 191 |
else |
| 193 | 192 |
disable_apache_site placement-api |
| 194 | 193 |
restart_apache_server |