saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Azure: ensure subscription_id is a str type

Browse source 
Resolves #46953.
This commit is contained in:
Erik Johnson 2018-04-11 02:14:15 -05:00
parent 6503bf8dfa
commit 5192622a32
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/cloud/clouds/azurearm.py
View file

@ -65,6 +65,7 @@ import salt.config as config
import salt.utils.cloud
import salt.utils.data
import salt.utils.files
import salt.utils.stringutils
import salt.utils.yaml
from salt.utils.versions import LooseVersion
from salt.ext import six
@ -197,9 +198,11 @@ def get_conn(Client=None):
if Client is None:
Client = ComputeManagementClient
subscription_id = config.get_cloud_config_value(
'subscription_id',
get_configured_provider(), __opts__, search_global=False
subscription_id = salt.utils.stringutils.to_str(
config.get_cloud_config_value(
'subscription_id',
get_configured_provider(), __opts__, search_global=False
)
)
tenant = config.get_cloud_config_value(

17
salt/cloud/clouds/msazure.py
View file

@ -49,6 +49,7 @@ import time
import salt.config as config
from salt.exceptions import SaltCloudSystemExit
import salt.utils.cloud
import salt.utils.stringutils
import salt.utils.yaml
# Import 3rd-party libs
@ -117,9 +118,11 @@ def get_conn():
'certificate_path',
get_configured_provider(), __opts__, search_global=False
)
subscription_id = config.get_cloud_config_value(
'subscription_id',
get_configured_provider(), __opts__, search_global=False
subscription_id = salt.utils.stringutils.to_str(
config.get_cloud_config_value(
'subscription_id',
get_configured_provider(), __opts__, search_global=False
)
)
management_host = config.get_cloud_config_value(
'management_host',
@ -3369,9 +3372,11 @@ def query(path, method='GET', data=None, params=None, header_dict=None, decode=T
'certificate_path',
get_configured_provider(), __opts__, search_global=False
)
subscription_id = config.get_cloud_config_value(
'subscription_id',
get_configured_provider(), __opts__, search_global=False
subscription_id = salt.utils.stringutils.to_str(
config.get_cloud_config_value(
'subscription_id',
get_configured_provider(), __opts__, search_global=False
)
)
management_host = config.get_cloud_config_value(
'management_host',