Merge pull request #6705 from jangsutsr/6516_audit_cloud_regions

Audit lists of cloud regions
This commit is contained in:
Aaron Tan 2017-06-29 12:14:01 -04:00 committed by GitHub
commit bfb56480b2

View File

@ -715,19 +715,36 @@ VMWARE_EXCLUDE_EMPTY_GROUPS = True
# provide a list here.
# Source: https://developers.google.com/compute/docs/zones
GCE_REGION_CHOICES = [
('us-east1-b', _('US East (B)')),
('us-east1-c', _('US East (C)')),
('us-east1-d', _('US East (D)')),
('us-east1-b', _('US East 1 (B)')),
('us-east1-c', _('US East 1 (C)')),
('us-east1-d', _('US East 1 (D)')),
('us-east4-a', _('US East 4 (A)')),
('us-east4-b', _('US East 4 (B)')),
('us-east4-c', _('US East 4 (C)')),
('us-central1-a', _('US Central (A)')),
('us-central1-b', _('US Central (B)')),
('us-central1-c', _('US Central (C)')),
('us-central1-f', _('US Central (F)')),
('europe-west1-b', _('Europe West (B)')),
('europe-west1-c', _('Europe West (C)')),
('europe-west1-d', _('Europe West (D)')),
('us-west1-a', _('US West (A)')),
('us-west1-b', _('US West (B)')),
('us-west1-c', _('US West (C)')),
('europe-west1-b', _('Europe West 1 (B)')),
('europe-west1-c', _('Europe West 1 (C)')),
('europe-west1-d', _('Europe West 1 (D)')),
('europe-west2-a', _('Europe West 2 (A)')),
('europe-west2-b', _('Europe West 2 (B)')),
('europe-west2-c', _('Europe West 2 (C)')),
('asia-east1-a', _('Asia East (A)')),
('asia-east1-b', _('Asia East (B)')),
('asia-east1-c', _('Asia East (C)')),
('asia-southeast1-a', _('Asia Southeast (A)')),
('asia-southeast1-b', _('Asia Southeast (B)')),
('asia-northeast1-a', _('Asia Northeast (A)')),
('asia-northeast1-b', _('Asia Northeast (B)')),
('asia-northeast1-c', _('Asia Northeast (C)')),
('australia-southeast1-a', _('Australia Southeast (A)')),
('australia-southeast1-b', _('Australia Southeast (B)')),
('australia-southeast1-c', _('Australia Southeast (C)')),
]
GCE_REGIONS_BLACKLIST = []
@ -756,14 +773,25 @@ AZURE_REGION_CHOICES = [
('East_US_2', _('US East 2')),
('North_Central_US', _('US North Central')),
('South_Central_US', _('US South Central')),
('West_Central_US', _('US West Central')),
('West_US', _('US West')),
('East_Canada', _('Canada East')),
('Central_Canada', _('Canada Central')),
('South_Brazil', _('Brazil South')),
('North_Europe', _('Europe North')),
('West_Europe', _('Europe West')),
('East_Asia_Pacific', _('Asia Pacific East')),
('Southest_Asia_Pacific', _('Asia Pacific Southeast')),
('West_UK', _('UK West')),
('South_UK', _('UK South')),
('East_Asia', _('Asia East')),
('Southest_Asia', _('Asia Southeast')),
('East_Australia', _('Australia East')),
('Southest_Australia', _('Australia Southeast')),
('West_India', _('India West')),
('South_India', _('India South')),
('East_Japan', _('Japan East')),
('West_Japan', _('Japan West')),
('South_Brazil', _('Brazil South')),
('Central_Korea', _('Korea Central')),
('South_Korea', _('Korea South')),
]
AZURE_REGIONS_BLACKLIST = []