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

Check existence before calling get method (#56105)

Browse source
This commit is contained in:
MyronFanQiu 2019-05-07 09:26:02 +08:00 committed by Yunge Zhu
parent ec56ea4514
commit 14c218bb2f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -306,6 +306,7 @@ options:
description: description:
- Accept terms for marketplace images that require it - Accept terms for marketplace images that require it
- Only Azure service admin/account admin users can purchase images from the marketplace - Only Azure service admin/account admin users can purchase images from the marketplace
- C(plan) must be set when C(accept_terms) is true
type: bool type: bool
default: false default: false
version_added: "2.7" version_added: "2.7"
@ -1282,7 +1283,7 @@ class AzureRMVirtualMachine(AzureRMModuleBase):
# Before creating VM accept terms of plan if `accept_terms` is True # Before creating VM accept terms of plan if `accept_terms` is True
if self.accept_terms is True: if self.accept_terms is True:
if not all([self.plan.get('name'), self.plan.get('product'), self.plan.get('publisher')]): if not self.plan or not all([self.plan.get('name'), self.plan.get('product'), self.plan.get('publisher')]):
self.fail("parameter error: plan must be specified and include name, product, and publisher") self.fail("parameter error: plan must be specified and include name, product, and publisher")
try: try:
plan_name = self.plan.get('name') plan_name = self.plan.get('name')