VR: remove apache2 config for removed VPC tiers

[weizhouapache]

Description

This PR fixes #7968

Steps to reproduce the issue

• create vpc with redundant VRs (cidr: 172.24.0.0/20)
• create vpc tier1 with 172.24.1.0/24, create vm1 on it
• create vpc tier2 with 172.24.2.0/24, create vm2 on it
• destroy vm2, delete vpc tier2
• create vpc tier2-new1 with 172.24.2.0/24, create vm2-new1 on it
• destroy vm2-new1, delete vpc tier2-new1
• create vpc tier2-new2 with 172.24.2.0/24, create vm2-new2 on it
• check apache2 config files in /etc/apache2/site-enabled

expected: there are only config files for tier1 and tier2-new2
actual: there are config files for tier1, tier2, tier2-new1, tier2-new2

Types of changes

• Breaking change (fix or feature that would cause existing functionality to change)
• New feature (non-breaking change which adds functionality)
• Bug fix (non-breaking change which fixes an issue)
• Enhancement (improves an existing feature and functionality)
• Cleanup (Code refactoring and cleanup, that may add test cases)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

• Major
• Minor

Bug Severity

• BLOCKER
• Critical
• Major
• Minor
• Trivial

Screenshots (if appropriate):

How Has This Been Tested?

[weizhouapache]

@blueorangutan package

[blueorangutan]

@weizhouapache a [SF] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

[DaanHoogland]

clgtm and seems to address the issue. Need to test

[blueorangutan]

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 7070

[codecov]

Codecov Report

Merging #7982 (7abee1b) into 4.18 (09ae049) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               4.18    #7982   +/-   ##
=========================================
  Coverage     13.06%   13.06%           
  Complexity     9105     9105           
=========================================
  Files          2720     2720           
  Lines        257494   257494           
  Branches      40148    40148           
=========================================
  Hits          33642    33642           
  Misses       219623   219623           
  Partials       4229     4229           

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

[weizhouapache]

@blueorangutan test

[blueorangutan]

@weizhouapache a [SF] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

@weizhouapache a [SF] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

[blueorangutan]

[SF] Trillian test result (tid-7698)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41356 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7982-t7698-kvm-centos7.zip
Smoke tests completed. 108 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

[blueorangutan]

[SF] Trillian test result (tid-7696)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43182 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7982-t7696-kvm-centos7.zip
Smoke tests completed. 107 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_02_upgrade_kubernetes_cluster	Failure	597.56	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	Failure	617.55	test_kubernetes_clusters.py

[kiranchavala]

LGTM, Tested the issue manually for both default vpc and redundant vpc offering

Followed the steps, and only the config files for the active tiers are present

1.     create vpc with redundant VRs (cidr: 172.24.0.0/20)
2.     create vpc tier1 with 172.24.1.0/24, create vm1 on it
3.     create vpc tier2 with 172.24.2.0/24, create vm2 on it
4.     destroy vm2, delete vpc tier2
5.     create vpc tier2-new1 with 172.24.2.0/24, create vm2-new1 on it
6.     destroy vm2-new1, delete vpc tier2-new1
7.     create vpc tier2-new2 with 172.24.2.0/24, create vm2-new2 on it
8.     check apache2 config files in /etc/apache2/site-enabled

[weizhouapache]

LGTM, Tested the issue manually for both default vpc and redundant vpc offering

Followed the steps, and only the config files for the active tiers are present

1.     create vpc with redundant VRs (cidr: 172.24.0.0/20)
2.     create vpc tier1 with 172.24.1.0/24, create vm1 on it
3.     create vpc tier2 with 172.24.2.0/24, create vm2 on it
4.     destroy vm2, delete vpc tier2
5.     create vpc tier2-new1 with 172.24.2.0/24, create vm2-new1 on it
6.     destroy vm2-new1, delete vpc tier2-new1
7.     create vpc tier2-new2 with 172.24.2.0/24, create vm2-new2 on it
8.     check apache2 config files in /etc/apache2/site-enabled

thanks @kiranchavala for the testing