|
|
@ -155,7 +155,7 @@ def _set_tenant_id(module):
|
|
|
|
for tenant in _os_keystone.tenants.list():
|
|
|
|
for tenant in _os_keystone.tenants.list():
|
|
|
|
if tenant.name == tenant_name:
|
|
|
|
if tenant.name == tenant_name:
|
|
|
|
_os_tenant_id = tenant.id
|
|
|
|
_os_tenant_id = tenant.id
|
|
|
|
break;
|
|
|
|
break
|
|
|
|
if not _os_tenant_id:
|
|
|
|
if not _os_tenant_id:
|
|
|
|
module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
|
|
|
|
module.fail_json(msg = "The tenant id cannot be found, please check the paramters")
|
|
|
|
|
|
|
|
|
|
|
@ -205,16 +205,18 @@ def _create_subnet(module, quantum):
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if module.params['allocation_pool_start'] and module.params['allocation_pool_end']:
|
|
|
|
if module.params['allocation_pool_start'] and module.params['allocation_pool_end']:
|
|
|
|
allocation_pools = [
|
|
|
|
allocation_pools = [
|
|
|
|
{'start': module.params['allocation_pool_start'],
|
|
|
|
{
|
|
|
|
'end': module.params['allocation_pool_end']}
|
|
|
|
'start' : module.params['allocation_pool_start'],
|
|
|
|
|
|
|
|
'end' : module.params['allocation_pool_end']
|
|
|
|
|
|
|
|
}
|
|
|
|
]
|
|
|
|
]
|
|
|
|
subnet.update({'allocation_pools': allocation_pools})
|
|
|
|
subnet.update({'allocation_pools': allocation_pools})
|
|
|
|
if not module.params['gateway_ip']:
|
|
|
|
if not module.params['gateway_ip']:
|
|
|
|
subnet.pop('gateway_ip')
|
|
|
|
subnet.pop('gateway_ip')
|
|
|
|
try:
|
|
|
|
try:
|
|
|
|
new_subnet = quantum.create_subnet({'subnet': subnet })
|
|
|
|
new_subnet = quantum.create_subnet(dict(subnet=subnet))
|
|
|
|
except Exception as e:
|
|
|
|
except Exception, e:
|
|
|
|
module.fail_json( msg = "Failure in creating subnet: %s" %e.message)
|
|
|
|
module.fail_json(msg = "Failure in creating subnet: %s" % e.message)
|
|
|
|
return new_subnet['subnet']['id']
|
|
|
|
return new_subnet['subnet']['id']
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -259,10 +261,10 @@ def main():
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
subnet_id = _get_subnet_id(module, quantum)
|
|
|
|
subnet_id = _get_subnet_id(module, quantum)
|
|
|
|
if not subnet_id:
|
|
|
|
if not subnet_id:
|
|
|
|
module.exit_json(changed = False, result = "success" )
|
|
|
|
module.exit_json(changed = False, result = "success")
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
_delete_subnet(module, quantum, subnet_id)
|
|
|
|
_delete_subnet(module, quantum, subnet_id)
|
|
|
|
module.exit_json(changed = True, result = "deleted" )
|
|
|
|
module.exit_json(changed = True, result = "deleted")
|
|
|
|
|
|
|
|
|
|
|
|
# this is magic, see lib/ansible/module.params['common.py
|
|
|
|
# this is magic, see lib/ansible/module.params['common.py
|
|
|
|
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
|
|
|
|
#<<INCLUDE_ANSIBLE_MODULE_COMMON>>
|
|
|
|