From 7787140214b4e0338cdf35a1bba722e13bc04427 Mon Sep 17 00:00:00 2001 From: Brendan Shephard Date: Thu, 21 Jul 2022 13:38:34 +1000 Subject: Remove CloudWatch cleanup tasks This change removes the cloud watch cleanup tasks as part of general housecleaning. Change-Id: Id8f678dfd504ff27d6fdb86011129d353a31f3cf --- devstack/lib/heat | 8 -------- devstack/upgrade/shutdown.sh | 4 ---- 2 files changed, 12 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index dcd59b6f4..ea6a353c6 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -333,14 +333,6 @@ function stop_heat { fi } -# TODO(ramishra): Remove after Queens -function stop_cw_service { - if $SYSTEMCTL is-enabled devstack@h-api-cw.service; then - $SYSTEMCTL stop devstack@h-api-cw.service - $SYSTEMCTL disable devstack@h-api-cw.service - fi -} - # _cleanup_heat_apache_wsgi() - Remove wsgi files, disable and remove apache vhost file function _cleanup_heat_apache_wsgi { if [[ "$WSGI_MODE" == "uwsgi" ]]; then diff --git a/devstack/upgrade/shutdown.sh b/devstack/upgrade/shutdown.sh index dfe566cee..f512e8d4d 100755 --- a/devstack/upgrade/shutdown.sh +++ b/devstack/upgrade/shutdown.sh @@ -30,10 +30,6 @@ set -o xtrace stop_heat -# stop cloudwatch service if running -# TODO(ramishra): Remove it after Queens -stop_cw_service - SERVICES_DOWN="heat-api heat-engine heat-api-cfn" # sanity check that services are actually down -- cgit v1.2.1