Fixes #27364 - Added missing supported Azure Regions (#74)

theforeman · Feb 12, 2020 · 3f2a6b1 · 3f2a6b1
1 parent ed0e921
commit 3f2a6b1
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/app/models/foreman_azure_rm/azure_rm.rb b/app/models/foreman_azure_rm/azure_rm.rb
@@ -69,7 +69,44 @@ def self.regions
           ['East US', 'eastus'],
           ['East US 2', 'eastus2'],
           ['West US', 'westus'],
-          ['West US 2', 'westus2']
+          ['West US 2', 'westus2'],
+          ['Canada Central', 'canadacentral'],
+          ['Canada East', 'canadaeast'],
+          ['Brazil South', 'brazilsouth'],
+          ['North Europe', 'northeurope'],
+          ['France Central', 'francecentral'],
+          ['France South', 'francesouth'],
+          ['UK South', 'uksouth'],
+          ['UK West', 'ukwest'],
+          ['Germany Central', 'germanycentral'],
+          ['Germany Northeast', 'germanynortheast'],
+          ['Germany West Central', 'germanywestcentral'],
+          ['Germany North', 'germanynorth'],
+          ['Switzerland North', 'switzerlandnorth'],
+          ['Switzerland West', 'switzerlandwest'],
+          ['Norway West', 'norwaywest'],
+          ['Norway East', 'norwayeast'],
+          ['East Asia', 'eastasia'],
+          ['Southeast Asia', 'southeastasia'],
+          ['Australia Central', 'australiacentral'],
+          ['Australia Central 2', 'australiacentral2'],
+          ['Australia East', 'australiaeast'],
+          ['Australia Southeast', 'australiasoutheast'],
+          ['China East', 'chinaeast'],
+          ['China North', 'chinanorth'],
+          ['China East 2', 'chinaeast2'],
+          ['China North 2', 'chinanorth2'],
+          ['Central India', 'centralindia'],
+          ['South India', 'southindia'],
+          ['West India', 'westindia'],
+          ['Japan East', 'japaneast'],
+          ['Japan West', 'japanwest'],
+          ['Korea Central', 'koreacentral'],
+          ['Korea South', 'koreasouth'],
+          ['South Africa North', 'southafricanorth'],
+          ['South Africa West', 'southafricawest'],
+          ['UAE Central', 'uaecentral'],
+          ['UAE North', 'uaenorth']
       ]
     end
 

diff --git a/app/views/compute_resources/form/_azurerm.html.erb b/app/views/compute_resources/form/_azurerm.html.erb
@@ -3,7 +3,7 @@
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>
 
-<%= selectable_f(f, :url, f.object.class.regions, {}, {:label => _('Azure Region'), :required => true }) %>
+<%= selectable_f(f, :url, f.object.class.regions, {}, {:label => _('Azure Region'), :label_help => _("Some of the listed regions might not be supported for your subscription. Please verify on Azure portal."), :required => true }) %>
 
 <div class="col-md-offset-2">
     <%= test_connection_button_f(f, true) %>