Merge pull request #10370 from techhat/azure

management_host should be optional

doc/topics/cloud/azure.rst

@@ -37,7 +37,10 @@ Set up the provider config at ``/etc/salt/cloud.providers.d/azure.conf``:
       minion:
         master: saltmaster.example.com
 
-      provider: gce
+      provider: azure
+
+      # Optional
+      management_host: management.core.windows.net
 
 The certificate used must be generated by the user. OpenSSL can be used to
 create the management certificates. Two certificates are needed: a .cer file,
@@ -58,6 +61,9 @@ To create the .cer file, execute the following command:
 After you creating these files, the .cer file will need to be uploaded to
 Azure via the "Upload" action of the "Settings" tab of the management portal.
 
+Optionally, a ``management_host`` may be configured, if necessary for your
+region.
+
 
 Cloud Profiles
 ==============

salt/cloud/clouds/msazure.py

@@ -77,7 +77,7 @@ def get_configured_provider():
     return config.is_provider_configured(
         __opts__,
         __active_provider_name__ or __virtualname__,
-        ('subscription_id', 'certificate_path', 'management_host')
+        ('subscription_id', 'certificate_path')
     )
 
 
@@ -95,7 +95,10 @@ def get_conn():
     )
     management_host = config.get_cloud_config_value(
         'management_host',
-        get_configured_provider(), __opts__, search_global=False
+        get_configured_provider(),
+        __opts__,
+        search_global=False,
+        default='management.core.windows.net'
     )
     return azure.servicemanagement.ServiceManagementService(
         subscription_id, certificate_path, management_host