ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Azure azure_rm_common update (#28227)

Browse source 
* include support for DNS modules

added code to allow DNS modules to run

* fixed issue with dns

* removed extra end of file line
This commit is contained in:
Ozi Boms 2017-08-15 15:55:13 -07:00 committed by Matt Davis
parent c2b2176893
commit da3f8df20d
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/module_utils/azure_rm_common.py
View file

@ -94,10 +94,12 @@ try:
from azure.mgmt.storage.version import VERSION as storage_client_version from azure.mgmt.storage.version import VERSION as storage_client_version
from azure.mgmt.compute.version import VERSION as compute_client_version from azure.mgmt.compute.version import VERSION as compute_client_version
from azure.mgmt.resource.version import VERSION as resource_client_version from azure.mgmt.resource.version import VERSION as resource_client_version
from azure.mgmt.dns.version import VERSION as dns_client_version
from azure.mgmt.network import NetworkManagementClient from azure.mgmt.network import NetworkManagementClient
from azure.mgmt.resource.resources import ResourceManagementClient from azure.mgmt.resource.resources import ResourceManagementClient
from azure.mgmt.storage import StorageManagementClient from azure.mgmt.storage import StorageManagementClient
from azure.mgmt.compute import ComputeManagementClient from azure.mgmt.compute import ComputeManagementClient
from azure.mgmt.dns import DnsManagementClient
from azure.storage.cloudstorageaccount import CloudStorageAccount from azure.storage.cloudstorageaccount import CloudStorageAccount
except ImportError as exc: except ImportError as exc:
HAS_AZURE_EXC = exc HAS_AZURE_EXC = exc
@ -126,7 +128,8 @@ AZURE_EXPECTED_VERSIONS = dict(
storage_client_version="1.0.0", storage_client_version="1.0.0",
compute_client_version="1.0.0", compute_client_version="1.0.0",
network_client_version="1.0.0", network_client_version="1.0.0",
resource_client_version="1.1.0" resource_client_version="1.1.0",
dns_client_version="1.0.1"
) )
AZURE_MIN_RELEASE = '2.0.0' AZURE_MIN_RELEASE = '2.0.0'
@ -174,6 +177,7 @@ class AzureRMModuleBase(object):
self._storage_client = None self._storage_client = None
self._resource_client = None self._resource_client = None
self._compute_client = None self._compute_client = None
self._dns_client = None
self.check_mode = self.module.check_mode self.check_mode = self.module.check_mode
self.facts_module = facts_module self.facts_module = facts_module
# self.debug = self.module.params.get('debug') # self.debug = self.module.params.get('debug')
@ -683,3 +687,16 @@ class AzureRMModuleBase(object):
) )
self._register('Microsoft.Compute') self._register('Microsoft.Compute')
return self._compute_client return self._compute_client
@property
def dns_client(self):
self.log('Getting dns client')
if not self._dns_client:
self.check_client_version('dns', dns_client_version, AZURE_EXPECTED_VERSIONS['dns_client_version'])
self._dns_client = DnsManagementClient(
self.azure_credentials,
self.subscription_id,
base_url=self.base_url
)
self._register('Microsoft.Dns')
return self._dns_client