cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix poller for some resources (#54853)

Browse source
This commit is contained in:
Zim Kalinowski 2019-04-08 09:41:10 +08:00 committed by GitHub
parent 684b749e47
commit 3be01cce33
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/cloud/azure/azure_rm_rediscache.py
View file

@ -209,6 +209,7 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try:
from msrestazure.azure_exceptions import CloudError
from msrest.polling import LROPoller
from msrestazure.azure_operation import AzureOperationPoller
from msrest.serialization import Model
from azure.mgmt.redis import RedisManagementClient
@ -561,7 +562,7 @@ class AzureRMRedisCaches(AzureRMModuleBase):
response = self._client.redis.create(resource_group_name=self.resource_group,
name=self.name,
parameters=params)
if isinstance(response, AzureOperationPoller):
if isinstance(response, LROPoller) or isinstance(response, AzureOperationPoller):
response = self.get_poller_result(response)
except CloudError as exc:
@ -597,7 +598,7 @@ class AzureRMRedisCaches(AzureRMModuleBase):
response = self._client.redis.update(resource_group_name=self.resource_group,
name=self.name,
parameters=params)
if isinstance(response, AzureOperationPoller):
if isinstance(response, LROPoller) or isinstance(response, AzureOperationPoller):
response = self.get_poller_result(response)
except CloudError as exc:

3
lib/ansible/modules/cloud/azure/azure_rm_rediscachefirewallrule.py
View file

@ -90,6 +90,7 @@ from ansible.module_utils.azure_rm_common import AzureRMModuleBase
try:
from msrestazure.azure_exceptions import CloudError
from msrest.polling import LROPoller
from msrestazure.azure_operation import AzureOperationPoller
from msrest.serialization import Model
from azure.mgmt.redis import RedisManagementClient
@ -258,7 +259,7 @@ class AzureRMRedisCacheFirewallRule(AzureRMModuleBase):
rule_name=self.name,
start_ip=self.start_ip_address,
end_ip=self.end_ip_address)
if isinstance(response, AzureOperationPoller):
if isinstance(response, LROPoller) or isinstance(response, AzureOperationPoller):
response = self.get_poller_result(response)
except CloudError as exc:

2
lib/ansible/modules/cloud/azure/azure_rm_roledefinition.py
View file

@ -331,7 +331,7 @@ class AzureRMRoleDefinition(AzureRMModuleBase):
response = self._client.role_definitions.create_or_update(role_definition_id=self.role['name'] if self.role else str(uuid.uuid4()),
scope=self.scope,
role_definition=role_definition)
if isinstance(response, AzureOperationPoller):
if isinstance(response, LROPoller) or isinstance(response, AzureOperationPoller):
response = self.get_poller_result(response)
except CloudError as exc: