archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8449 from emonty/feature/openstack-auth-handling

Browse Source 
Handle auth arguments across openstack modules consistently
reviewable/pr18780/r1
Michael DeHaan 10 years ago
parent 6bd986b80e 8a6a8d8af2
commit ca7b0f3673
11 changed files with 73 additions and 107 deletions
Show Stats Download Patch File Download Diff File

36
cloud/glance_image
Unescape Escape View File

@ -217,26 +217,23 @@ def _glance_delete_image(module, params, client):
def main(): def main():
argument_spec = openstack_argument_spec()
argument_spec.update(dict(
name = dict(required=True),
disk_format = dict(default='qcow2', choices=['aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso']),
container_format = dict(default='bare', choices=['aki', 'ari', 'bare', 'ovf']),
owner = dict(default=None),
min_disk = dict(default=None),
min_ram = dict(default=None),
is_public = dict(default=True),
copy_from = dict(default= None),
timeout = dict(default=180),
file = dict(default=None),
endpoint_type = dict(default='publicURL', choices=['publicURL', 'internalURL']),
state = dict(default='present', choices=['absent', 'present'])
))
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec=argument_spec,
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required=True),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
name = dict(required=True),
disk_format = dict(default='qcow2', choices=['aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso']),
container_format = dict(default='bare', choices=['aki', 'ari', 'bare', 'ovf']),
owner = dict(default=None),
min_disk = dict(default=None),
min_ram = dict(default=None),
is_public = dict(default=True),
copy_from = dict(default= None),
timeout = dict(default=180),
file = dict(default=None),
endpoint_type = dict(default='publicURL', choices=['publicURL', 'internalURL']),
state = dict(default='present', choices=['absent', 'present'])
),
mutually_exclusive = [['file','copy_from']], mutually_exclusive = [['file','copy_from']],
) )
if module.params['state'] == 'present': if module.params['state'] == 'present':
@ -258,4 +255,5 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/keystone_user
Unescape Escape View File

@ -287,11 +287,8 @@ def ensure_role_absent(keystone, uesr, tenant, role, check_mode):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec=dict( argument_spec.update(dict(
user=dict(required=False),
password=dict(required=False),
tenant=dict(required=False),
tenant_description=dict(required=False), tenant_description=dict(required=False),
email=dict(required=False), email=dict(required=False),
role=dict(required=False), role=dict(required=False),
@ -302,7 +299,11 @@ def main():
login_user=dict(required=False), login_user=dict(required=False),
login_password=dict(required=False), login_password=dict(required=False),
login_tenant_name=dict(required=False) login_tenant_name=dict(required=False)
), ))
# keystone operations themselves take an endpoint, not a keystone auth_url
del(argument_spec['auth_url'])
module = AnsibleModule(
argument_spec=argument_spec,
supports_check_mode=True, supports_check_mode=True,
mutually_exclusive=[['token', 'login_user'], mutually_exclusive=[['token', 'login_user'],
['token', 'login_password'], ['token', 'login_password'],
@ -388,5 +389,6 @@ def dispatch(keystone, user=None, password=None, tenant=None,
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
if __name__ == '__main__': if __name__ == '__main__':
main() main()

18
cloud/nova_compute
Unescape Escape View File

@ -17,6 +17,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
import os
try: try:
from novaclient.v1_1 import client as nova_client from novaclient.v1_1 import client as nova_client
from novaclient import exceptions from novaclient import exceptions
@ -224,13 +226,8 @@ def _get_server_state(module, nova):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
name = dict(required=True), name = dict(required=True),
image_id = dict(default=None), image_id = dict(default=None),
flavor_id = dict(default=1), flavor_id = dict(default=1),
@ -241,9 +238,9 @@ def main():
wait = dict(default='yes', choices=['yes', 'no']), wait = dict(default='yes', choices=['yes', 'no']),
wait_for = dict(default=180), wait_for = dict(default=180),
state = dict(default='present', choices=['absent', 'present']), state = dict(default='present', choices=['absent', 'present']),
user_data = dict(default=None) user_data = dict(default=None),
), ))
) module = AnsibleModule(argument_spec=argument_spec)
nova = nova_client.Client(module.params['login_username'], nova = nova_client.Client(module.params['login_username'],
module.params['login_password'], module.params['login_password'],
@ -270,5 +267,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/nova_keypair
Unescape Escape View File

@ -87,18 +87,13 @@ EXAMPLES = '''
''' '''
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
name = dict(required=True), name = dict(required=True),
public_key = dict(default=None), public_key = dict(default=None),
state = dict(default='present', choices=['absent', 'present']) state = dict(default='present', choices=['absent', 'present'])
), ))
) module = AnsibleModule(argument_spec=argument_spec)
nova = nova_client.Client(module.params['login_username'], nova = nova_client.Client(module.params['login_username'],
module.params['login_password'], module.params['login_password'],
@ -138,5 +133,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_floating_ip
Unescape Escape View File

@ -220,19 +220,14 @@ def _update_floating_ip(neutron, module, port_id, floating_ip_id):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
network_name = dict(required=True), network_name = dict(required=True),
instance_name = dict(required=True), instance_name = dict(required=True),
state = dict(default='present', choices=['absent', 'present']), state = dict(default='present', choices=['absent', 'present']),
internal_network_name = dict(default=None), internal_network_name = dict(default=None),
), ))
) module = AnsibleModule(argument_spec=argument_spec)
try: try:
nova = nova_client.Client(module.params['login_username'], module.params['login_password'], nova = nova_client.Client(module.params['login_username'], module.params['login_password'],
@ -266,5 +261,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_floating_ip_associate
Unescape Escape View File

@ -178,18 +178,13 @@ def _update_floating_ip(neutron, module, port_id, floating_ip_id):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
ip_address = dict(required=True), ip_address = dict(required=True),
instance_name = dict(required=True), instance_name = dict(required=True),
state = dict(default='present', choices=['absent', 'present']) state = dict(default='present', choices=['absent', 'present'])
), ))
) module = AnsibleModule(argument_spec=argument_spec)
try: try:
nova = nova_client.Client(module.params['login_username'], module.params['login_password'], nova = nova_client.Client(module.params['login_username'], module.params['login_password'],
@ -218,5 +213,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_network
Unescape Escape View File

@ -230,13 +230,8 @@ def _delete_network(module, net_id, neutron):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
name = dict(required=True), name = dict(required=True),
tenant_name = dict(default=None), tenant_name = dict(default=None),
provider_network_type = dict(default=None, choices=['local', 'vlan', 'flat', 'gre']), provider_network_type = dict(default=None, choices=['local', 'vlan', 'flat', 'gre']),
@ -246,8 +241,8 @@ def main():
shared = dict(default=False, type='bool'), shared = dict(default=False, type='bool'),
admin_state_up = dict(default=True, type='bool'), admin_state_up = dict(default=True, type='bool'),
state = dict(default='present', choices=['absent', 'present']) state = dict(default='present', choices=['absent', 'present'])
), ))
) module = AnsibleModule(argument_spec=argument_spec)
if module.params['provider_network_type'] in ['vlan' , 'flat']: if module.params['provider_network_type'] in ['vlan' , 'flat']:
if not module.params['provider_physical_network']: if not module.params['provider_physical_network']:
@ -279,5 +274,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_router
Unescape Escape View File

@ -175,19 +175,14 @@ def _delete_router(module, neutron, router_id):
return True return True
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
name = dict(required=True), name = dict(required=True),
tenant_name = dict(default=None), tenant_name = dict(default=None),
state = dict(default='present', choices=['absent', 'present']), state = dict(default='present', choices=['absent', 'present']),
admin_state_up = dict(type='bool', default=True), admin_state_up = dict(type='bool', default=True),
), ))
) module = AnsibleModule(argument_spec=argument_spec)
neutron = _get_neutron_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
@ -210,5 +205,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_router_gateway
Unescape Escape View File

@ -174,18 +174,13 @@ def _remove_gateway_router(neutron, module, router_id):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
router_name = dict(required=True), router_name = dict(required=True),
network_name = dict(required=True), network_name = dict(required=True),
state = dict(default='present', choices=['absent', 'present']), state = dict(default='present', choices=['absent', 'present']),
), ))
) module = AnsibleModule(argument_spec=argument_spec)
neutron = _get_neutron_client(module, module.params) neutron = _get_neutron_client(module, module.params)
router_id = _get_router_id(module, neutron) router_id = _get_router_id(module, neutron)
@ -213,5 +208,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_router_interface
Unescape Escape View File

@ -208,19 +208,14 @@ def _remove_interface_router(neutron, module, router_id, subnet_id):
return True return True
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
router_name = dict(required=True), router_name = dict(required=True),
subnet_name = dict(required=True), subnet_name = dict(required=True),
tenant_name = dict(default=None), tenant_name = dict(default=None),
state = dict(default='present', choices=['absent', 'present']), state = dict(default='present', choices=['absent', 'present']),
), ))
) module = AnsibleModule(argument_spec=argument_spec)
neutron = _get_neutron_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
@ -249,5 +244,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

14
cloud/quantum_subnet
Unescape Escape View File

@ -252,13 +252,8 @@ def _delete_subnet(module, neutron, subnet_id):
def main(): def main():
module = AnsibleModule( argument_spec = openstack_argument_spec()
argument_spec = dict( argument_spec.update(dict(
login_username = dict(default='admin'),
login_password = dict(required=True),
login_tenant_name = dict(required='True'),
auth_url = dict(default='http://127.0.0.1:35357/v2.0/'),
region_name = dict(default=None),
name = dict(required=True), name = dict(required=True),
network_name = dict(required=True), network_name = dict(required=True),
cidr = dict(required=True), cidr = dict(required=True),
@ -270,8 +265,8 @@ def main():
dns_nameservers = dict(default=None), dns_nameservers = dict(default=None),
allocation_pool_start = dict(default=None), allocation_pool_start = dict(default=None),
allocation_pool_end = dict(default=None), allocation_pool_end = dict(default=None),
), ))
) module = AnsibleModule(argument_spec=argument_spec)
neutron = _get_neutron_client(module, module.params) neutron = _get_neutron_client(module, module.params)
_set_tenant_id(module) _set_tenant_id(module)
if module.params['state'] == 'present': if module.params['state'] == 'present':
@ -291,5 +286,6 @@ def main():
# this is magic, see lib/ansible/module.params['common.py # this is magic, see lib/ansible/module.params['common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.openstack import *
main() main()

Write Preview
Loading…
Cancel
Save