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

fixed quantum_ modules to work with minimum access rights if greater access rights are not needed

Browse source
This commit is contained in:
Markus Suonto 2015-11-26 15:34:47 +02:00 committed by Matt Clay
parent 5453d1e959
commit 39d3c3dea6
4 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/cloud/openstack/_quantum_network.py
View file

@ -160,18 +160,17 @@ def _get_neutron_client(module, kwargs):
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
if not module.params['tenant_name']: if not module.params['tenant_name']:
tenant_name = module.params['login_tenant_name'] _os_tenant_id = _os_keystone.tenant_id
else: else:
tenant_name = module.params['tenant_name'] tenant_name = module.params['tenant_name']
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 parameters") module.fail_json(msg = "The tenant id cannot be found, please check the parameters")
def _get_net_id(neutron, module): def _get_net_id(neutron, module):
kwargs = { kwargs = {
'tenant_id': _os_tenant_id, 'tenant_id': _os_tenant_id,

15
lib/ansible/modules/cloud/openstack/_quantum_router.py
View file

@ -132,17 +132,16 @@ def _get_neutron_client(module, kwargs):
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
if not module.params['tenant_name']: if not module.params['tenant_name']:
login_tenant_name = module.params['login_tenant_name'] _os_tenant_id = _os_keystone.tenant_id
else: else:
login_tenant_name = module.params['tenant_name'] tenant_name = module.params['tenant_name']
for tenant in _os_keystone.tenants.list(): for tenant in _os_keystone.tenants.list():
if tenant.name == login_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 parameters") module.fail_json(msg = "The tenant id cannot be found, please check the parameters")
def _get_router_id(module, neutron): def _get_router_id(module, neutron):
kwargs = { kwargs = {

13
lib/ansible/modules/cloud/openstack/_quantum_router_interface.py
View file

@ -133,18 +133,17 @@ def _get_neutron_client(module, kwargs):
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
if not module.params['tenant_name']: if not module.params['tenant_name']:
login_tenant_name = module.params['login_tenant_name'] _os_tenant_id = _os_keystone.tenant_id
else: else:
login_tenant_name = module.params['tenant_name'] tenant_name = module.params['tenant_name']
for tenant in _os_keystone.tenants.list(): for tenant in _os_keystone.tenants.list():
if tenant.name == login_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 parameters") module.fail_json(msg = "The tenant id cannot be found, please check the parameters")
def _get_router_id(module, neutron): def _get_router_id(module, neutron):
kwargs = { kwargs = {
'name': module.params['router_name'], 'name': module.params['router_name'],

12
lib/ansible/modules/cloud/openstack/quantum_subnet.py
View file

@ -166,16 +166,16 @@ def _get_neutron_client(module, kwargs):
def _set_tenant_id(module): def _set_tenant_id(module):
global _os_tenant_id global _os_tenant_id
if not module.params['tenant_name']: if not module.params['tenant_name']:
tenant_name = module.params['login_tenant_name'] _os_tenant_id = _os_keystone.tenant_id
else: else:
tenant_name = module.params['tenant_name'] tenant_name = module.params['tenant_name']
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 parameters") module.fail_json(msg = "The tenant id cannot be found, please check the parameters")
def _get_net_id(neutron, module): def _get_net_id(neutron, module):
kwargs = { kwargs = {