mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
fixed incorrect endpoint selection in azure_rm.py
This commit is contained in:
parent
8027aad4b8
commit
12700f61e7
1 changed files with 18 additions and 5 deletions
|
@ -412,7 +412,12 @@ class AzureRM(object):
|
||||||
def network_client(self):
|
def network_client(self):
|
||||||
self.log('Getting network client')
|
self.log('Getting network client')
|
||||||
if not self._network_client:
|
if not self._network_client:
|
||||||
self._network_client = NetworkManagementClient(self.azure_credentials, self.subscription_id, base_url=self._cloud_environment.endpoints.management)
|
self._network_client = NetworkManagementClient(
|
||||||
|
self.azure_credentials,
|
||||||
|
self.subscription_id,
|
||||||
|
base_url=self._cloud_environment.endpoints.resource_manager,
|
||||||
|
api_version='2017-06-01'
|
||||||
|
)
|
||||||
self._register('Microsoft.Network')
|
self._register('Microsoft.Network')
|
||||||
return self._network_client
|
return self._network_client
|
||||||
|
|
||||||
|
@ -420,16 +425,24 @@ class AzureRM(object):
|
||||||
def rm_client(self):
|
def rm_client(self):
|
||||||
self.log('Getting resource manager client')
|
self.log('Getting resource manager client')
|
||||||
if not self._resource_client:
|
if not self._resource_client:
|
||||||
self._resource_client = ResourceManagementClient(self.azure_credentials,
|
self._resource_client = ResourceManagementClient(
|
||||||
self.subscription_id,
|
self.azure_credentials,
|
||||||
base_url=self._cloud_environment.endpoints.management)
|
self.subscription_id,
|
||||||
|
base_url=self._cloud_environment.endpoints.resource_manager,
|
||||||
|
api_version='2017-05-10'
|
||||||
|
)
|
||||||
return self._resource_client
|
return self._resource_client
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def compute_client(self):
|
def compute_client(self):
|
||||||
self.log('Getting compute client')
|
self.log('Getting compute client')
|
||||||
if not self._compute_client:
|
if not self._compute_client:
|
||||||
self._compute_client = ComputeManagementClient(self.azure_credentials, self.subscription_id, base_url=self._cloud_environment.endpoints.management)
|
self._compute_client = ComputeManagementClient(
|
||||||
|
self.azure_credentials,
|
||||||
|
self.subscription_id,
|
||||||
|
base_url=self._cloud_environment.endpoints.resource_manager,
|
||||||
|
api_version='2017-03-30'
|
||||||
|
)
|
||||||
self._register('Microsoft.Compute')
|
self._register('Microsoft.Compute')
|
||||||
return self._compute_client
|
return self._compute_client
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue