wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle wait_for_deployment_completion during Azure deployment. (#26079)

Browse source 
Pull the get_poller_result inside the if block so that if the caller has
wait_for_deployment_completion=False, it doesnt block and wait for it to
finish.

Also, since the result contains information about the deployment, provide
None values for it in the output.(Not sure if this needs to be documented)

Fixes #26014
(cherry picked from commit c0000bc722)
This commit is contained in:
Raja Venkataraman 2017-09-12 22:37:32 +05:30 committed by Toshio Kuratomi
parent 77d1935f61
commit c92f44a806
1 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/ansible/modules/cloud/azure/azure_rm_deployment.py
View file

@ -446,13 +446,23 @@ class AzureRMDeploymentManager(AzureRMModuleBase):
if self.state == 'present': if self.state == 'present':
deployment = self.deploy_template() deployment = self.deploy_template()
self.results['deployment'] = dict( if deployment is None:
name=deployment.name, self.results['deployment'] = dict(
group_name=self.resource_group_name, name=self.deployment_name,
id=deployment.id, group_name=self.resource_group_name,
outputs=deployment.properties.outputs, id=None,
instances=self._get_instances(deployment) outputs=None,
) instances=None
)
else:
self.results['deployment'] = dict(
name=deployment.name,
group_name=self.resource_group_name,
id=deployment.id,
outputs=deployment.properties.outputs,
instances=self._get_instances(deployment)
)
self.results['changed'] = True self.results['changed'] = True
self.results['msg'] = 'deployment succeeded' self.results['msg'] = 'deployment succeeded'
else: else:
@ -498,8 +508,9 @@ class AzureRMDeploymentManager(AzureRMModuleBase):
self.deployment_name, self.deployment_name,
deploy_parameter) deploy_parameter)
deployment_result = self.get_poller_result(result) deployment_result = None
if self.wait_for_deployment_completion: if self.wait_for_deployment_completion:
deployment_result = self.get_poller_result(result)
while deployment_result.properties is None or deployment_result.properties.provisioning_state not in ['Canceled', 'Failed', 'Deleted', while deployment_result.properties is None or deployment_result.properties.provisioning_state not in ['Canceled', 'Failed', 'Deleted',
'Succeeded']: 'Succeeded']:
time.sleep(self.wait_for_deployment_polling_period) time.sleep(self.wait_for_deployment_polling_period)