summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorZim Kalinowski <zikalino@microsoft.com>2019-01-24 18:59:40 +0800
committerGitHub <noreply@github.com>2019-01-24 18:59:40 +0800
commitdb37be66fe0208db873f8d8db7ce00b3573bb6ff (patch)
tree6e57369106e772d137e69478a2e3344131342206 /lib
parentde542394af2e56bd3010e096822384d8bbd28c73 (diff)
downloadansible-db37be66fe0208db873f8d8db7ce00b3573bb6ff.tar.gz
updating azure compute mgmt package to the latest version (#51259)
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/module_utils/azure_rm_common.py8
-rw-r--r--lib/ansible/modules/cloud/azure/azure_rm_managed_disk.py6
-rw-r--r--lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py6
3 files changed, 10 insertions, 10 deletions
diff --git a/lib/ansible/module_utils/azure_rm_common.py b/lib/ansible/module_utils/azure_rm_common.py
index 0bb79fd95d..f9761f307b 100644
--- a/lib/ansible/module_utils/azure_rm_common.py
+++ b/lib/ansible/module_utils/azure_rm_common.py
@@ -57,7 +57,7 @@ AZURE_API_PROFILES = {
'ComputeManagementClient': dict(
default_api_version='2018-10-01',
resource_skus='2018-10-01',
- disks='2018-10-01',
+ disks='2018-06-01',
snapshots='2018-10-01',
virtual_machine_run_commands='2018-10-01'
),
@@ -204,7 +204,7 @@ AZURE_PKG_VERSIONS = {
},
'ComputeManagementClient': {
'package_name': 'compute',
- 'expected_version': '4.3.1'
+ 'expected_version': '4.4.0'
},
'ContainerInstanceManagementClient': {
'package_name': 'containerinstance',
@@ -826,13 +826,13 @@ class AzureRMModuleBase(object):
if not self._compute_client:
self._compute_client = self.get_mgmt_svc_client(ComputeManagementClient,
base_url=self._cloud_environment.endpoints.resource_manager,
- api_version='2017-03-30')
+ api_version='2018-06-01')
return self._compute_client
@property
def compute_models(self):
self.log("Getting compute models")
- return ComputeManagementClient.models("2017-03-30")
+ return ComputeManagementClient.models("2018-06-01")
@property
def dns_client(self):
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_managed_disk.py b/lib/ansible/modules/cloud/azure/azure_rm_managed_disk.py
index 9ce75c01b7..55fccd55b2 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_managed_disk.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_managed_disk.py
@@ -169,11 +169,11 @@ def managed_disk_to_dict(managed_disk):
name=managed_disk.name,
location=managed_disk.location,
tags=managed_disk.tags,
- create_option=create_data.create_option.value.lower(),
+ create_option=create_data.create_option.lower(),
source_uri=create_data.source_uri or create_data.source_resource_id,
disk_size_gb=managed_disk.disk_size_gb,
- os_type=managed_disk.os_type.value.lower() if managed_disk.os_type else None,
- storage_account_type=managed_disk.sku.name.value if managed_disk.sku else None,
+ os_type=managed_disk.os_type.lower() if managed_disk.os_type else None,
+ storage_account_type=managed_disk.sku.name if managed_disk.sku else None,
managed_by=managed_disk.managed_by
)
diff --git a/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py b/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py
index d3f11dcc76..6b2592a6f2 100644
--- a/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py
+++ b/lib/ansible/modules/cloud/azure/azure_rm_managed_disk_facts.py
@@ -129,11 +129,11 @@ def managed_disk_to_dict(managed_disk):
name=managed_disk.name,
location=managed_disk.location,
tags=managed_disk.tags,
- create_option=create_data.create_option.value.lower(),
+ create_option=create_data.create_option.lower(),
source_uri=create_data.source_uri or create_data.source_resource_id,
disk_size_gb=managed_disk.disk_size_gb,
- os_type=managed_disk.os_type.value.lower() if managed_disk.os_type else None,
- storage_account_type=managed_disk.sku.name.value if managed_disk.sku else None,
+ os_type=managed_disk.os_type.lower() if managed_disk.os_type else None,
+ storage_account_type=managed_disk.sku.name if managed_disk.sku else None,
managed_by=managed_disk.managed_by
)