valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10370 from techhat/azure

Browse Source 
management_host should be optional
This commit is contained in:
Pedro Algarvio 2014-02-11 22:43:08 +00:00
commit 7a071bdf79
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/topics/cloud/azure.rst
View File

@ -37,7 +37,10 @@ Set up the provider config at ``/etc/salt/cloud.providers.d/azure.conf``:
minion: minion:
master: saltmaster.example.com 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 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, 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 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. 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 Cloud Profiles
============== ==============

7
salt/cloud/clouds/msazure.py
View File

@ -77,7 +77,7 @@ def get_configured_provider():
return config.is_provider_configured( return config.is_provider_configured(
__opts__, __opts__,
__active_provider_name__ or __virtualname__, __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 = config.get_cloud_config_value(
'management_host', '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( return azure.servicemanagement.ServiceManagementService(
subscription_id, certificate_path, management_host subscription_id, certificate_path, management_host