internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-06 13:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cs_vpc: fix disabled or wrong vpc offering taken (#42465)

Browse Source
This commit is contained in:
René Moser
2018-07-09 08:31:13 +02:00
committed by GitHub
parent 3301a0b530
commit d7c3d5501b
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ansible/modules/cloud/cloudstack/cs_vpc.py
View File

@@ -219,16 +219,28 @@ class AnsibleCloudStackVpc(AnsibleCloudStack):
def get_vpc_offering(self, key=None):
vpc_offering = self.module.params.get('vpc_offering')
args = {}
args = {
'state': 'Enabled',
}
if vpc_offering:
args['name'] = vpc_offering
fail_msg = "VPC offering not found or not enabled: %s" % vpc_offering
else:
args['isdefault'] = True
fail_msg = "No enabled default VPC offering found"
vpc_offerings = self.query_api('listVPCOfferings', **args)
if vpc_offerings:
return self._get_by_key(key, vpc_offerings['vpcoffering'][0])
self.module.fail_json(msg="VPC offering not found: %s" % vpc_offering)
# The API name argument filter also matches substrings, we have to
# iterate over the results to get an exact match
for vo in vpc_offerings['vpcoffering']:
if 'name' in args:
if args['name'] == vo['name']:
return self._get_by_key(key, vo)
# Return the first offering found, if not queried for the name
else:
return self._get_by_key(key, vo)
self.module.fail_json(msg=fail_msg)
def get_vpc(self):
if self.vpc: