habsi/ansible
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix minimum client version checking

Browse Source 
* bump minimum client versions to match requirements file
* improve prescriptive error messaging to match current recommendations
(cherry-pick of #35018)
This commit is contained in:
Matt Davis
2018-01-17 14:10:17 -08:00
committed by Toshio Kuratomi
parent 949e2f06e5
commit 84dab220bf
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -70,7 +70,9 @@ Ansible Changes By Release
* Fix failure message "got multiple values for keyword argument id" in the
azure_rm_securitygroup module (caused by changes to the azure python API):
https://github.com/ansible/ansible/pull/34810
* Bump Azure storage client minimum to 1.5.0 to fix deserialization issues. This will break Azure Stack
until it receives storage API version 2017-10-01 or changes are made to support multiple versions.
(https://github.com/ansible/ansible/pull/34442)
<a id="2.4.2"></a>

10
lib/ansible/module_utils/azure_rm_common.py
View File

@ -141,17 +141,17 @@ def azure_id_to_dict(id):
AZURE_PKG_VERSIONS = {
StorageManagementClient.__name__: {
'package_name': 'storage',
'expected_version': '1.0.0',
'expected_version': '1.5.0',
'installed_version': storage_client_version
},
ComputeManagementClient.__name__: {
'package_name': 'compute',
'expected_version': '1.0.0',
'expected_version': '2.0.0',
'installed_version': compute_client_version
},
NetworkManagementClient.__name__: {
'package_name': 'network',
'expected_version': '1.0.0',
'expected_version': '1.3.0',
'installed_version': network_client_version
},
ResourceManagementClient.__name__: {
@ -209,7 +209,7 @@ class AzureRMModuleBase(object):
"- {0}".format(HAS_MSRESTAZURE_EXC))
if not HAS_AZURE:
self.fail("Do you have azure>={1} installed? Try `pip install 'azure>={1}' --upgrade`"
self.fail("Do you have azure>={1} installed? Try `pip install ansible[azure] --upgrade`"
"- {0}".format(HAS_AZURE_EXC, AZURE_MIN_RELEASE))
self._cloud_environment = None
@ -295,7 +295,7 @@ class AzureRMModuleBase(object):
expected_version = package_version.get('expected_version')
if Version(client_version) < Version(expected_version):
self.fail("Installed {0} client version is {1}. The supported version is {2}. Try "
"`pip install azure>={3} --upgrade`".format(client_name, client_version, expected_version,
"`pip install ansible[azure]`".format(client_name, client_version, expected_version,
AZURE_MIN_RELEASE))
def exec_module(self, **kwargs):