diff --git a/src/vmm_mad/remotes/az/az_driver.conf b/src/vmm_mad/remotes/az/az_driver.conf index c4a1301add..3ba2eeb7e1 100644 --- a/src/vmm_mad/remotes/az/az_driver.conf +++ b/src/vmm_mad/remotes/az/az_driver.conf @@ -1,98 +1,4 @@ proxy_uri: -regions: - default: - region_name: "West Europe" - # pem_management_cert --> Absolute path to pem management certificate - # Info on creating certificates: - # http://azure.microsoft.com/en-us/documentation/articles/linux-use-ssh-key/ - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: 5 - Medium: 1 - Large: 0 - west-europe: - region_name: "West Europe" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: 5 - Medium: 1 - Large: 0 - north-europe: - region_name: "North Europe" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - east-us: - region_name: "East US" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - south-central-us: - region_name: "South Central US" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - west-us: - region_name: "West US" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - east-asia: - region_name: "East Asia" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - southeast-asia: - region_name: "Southeast Asia" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - japan-west: - region_name: "Japan West" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: - brazil-south: - region_name: "Brazil South" - pem_management_cert: - subscription_id: - management_endpoint: - capacity: - Small: - Medium: - Large: instance_types: ExtraSmall: cpu: 1 diff --git a/src/vmm_mad/remotes/az/az_driver.rb b/src/vmm_mad/remotes/az/az_driver.rb index b5eaa28470..1e2ccb7f9e 100755 --- a/src/vmm_mad/remotes/az/az_driver.rb +++ b/src/vmm_mad/remotes/az/az_driver.rb @@ -154,15 +154,11 @@ class AzureDriver access_id = conn_opts[:id] endpoint_addr = conn_opts[:endpoint] - region_name = conn_opts[:region] + @region_name = conn_opts[:region] certificate << conn_opts[:cert] certificate.close - #DEPRECATE - ############################################################# - regions = @public_cloud_az_conf['regions'] - # Sanitize region data if certificate.nil? raise "pem_management_cert not defined for #{host}" @@ -425,19 +421,14 @@ private # try to use hostname as datacenter if !az.elements["LOCATION"] location=REXML::Element.new("LOCATION") - if @defaults["LOCATION"] - location.text=@defaults["LOCATION"] + if @region_name + location.text=@region_name else location.text=host end az.elements << location end - # Translate region name form keyword to actual value - region_keyword = az.elements["LOCATION"].text - translated_region = @public_cloud_az_conf["regions"][region_keyword] - az.elements["LOCATION"].text=translated_region["region_name"] - az end