ansible

Commit Graph

Author	SHA1	Message	Date
Trishna Guha	9eff1f1d74	Handle nxos_feature issue where json isn't supported (#39150 ) Signed-off-by: Trishna Guha <trishnaguha17@gmail.com>	7 years ago
Yuwei Zhou	9348809184	Fixes #37731 Create Internal Loadbalancers with azure_rm_loadbalancer, support SKU (#38077 ) * create internal loadbalancer * fix test * remove duplicate test * clean up * fix doc * lint * add sku support * update version * change to the version the same as CLI * add pip support sku * fix lint * fix test * Update main.yml * add changelog entry	7 years ago
Toshio Kuratomi	17a4553c68	Reorganize and expand the file tests * Pull the tests for state=link into their own file * Pull tests for what happens when dest is a directory out * Expand both of the above sets of tests	7 years ago
Pilou	a5d320f8e7	vdirect modules: fix 'import' sanity test (#39706 ) * vdirect modules: fix 'import' sanity test * Remove passing file from import skip list. * vdirect modules: fix validate-modules warnings - Arguments with a default should not be marked as required - add choices in doc * vdirect_runnable: use formatting function	7 years ago
Toshio Kuratomi	6b159fdb03	Fix for file module with recursive permission setting and broken symlinks There was a traceback when setting permissions on a directory tree when there were broken symlinks inside of the tree and follow=true. chmod -R ignores broken symlinks inside of the tree so we've fixed the file module to do the same. Fixes #39456	7 years ago
Toshio Kuratomi	4f664f8ff6	Fix for file module with symlinks to nonexistent target (#39635 ) * Fix for file module with symlinks to nonexistent target When creating a symlink to a nonexistent target, creating the symlink would work but subsequent runs of the task would fail because it was trying to operate on the target instead of the symlink. Fixes #39558	7 years ago
Jordan Borean	f75b7a9437	win_get_url: Fixed a few issues with using FTP and added tests (#39646 ) * win_get_url: Fixed a few issues with using FTP and added tests * Fixed typo in docs	7 years ago
Brian Coca	df1001577f	rebase base playbook base (#39533 ) * rebase base playbook base fixes issues with loop control allowing generic attributes it shouldn't	7 years ago
Kevin Breit	c8d287fece	Meraki organization module (#38773 ) * Initial commit Query an organization within Meraki. No support is in place for managing or creating yet * Change output_level method and make the state parameter required. * Implemented listing all organizations - Updated documentation - Parse results and return all organizations - Parse results and return specified organization * Framework for creating an organization - Documentation example for organization creation - Framework exists for creating organizations, pending PR 36809 - Created functions for HTTP calls - Renamed from dashboard.meraki.com to api.meraki.com - Added required_if for state * Remove absent state - Meraki API does not support deleting an organization so absent is removed - Updated documentation to call it state instead of status * Small change to documentation * Support all parameters associated to organization - Added all parameters needed for all organization actions. - None of the added ones work at this time. - Added documentation for clone. * Integration test for meraki_organization module * Rename module to meraki for porting to module utility * Meraki documentation fragment - Created initial documentation fragment for Meraki modules * Add meraki module utility to branch. Formerly was on a separate branch. * CRU support for Meraki organization module * CRU is supported for Meraki organizations * There is no DELETE function for organizations in the API * This code is very messy and needs cleanup * Create and Update actions don't show status as updated, must fix * Added Meraki module utility to module utility documentation list * Added support for organization cloning * Renamed use_ssl to use_https * Removed define_method() * Removed is_org() * Added is_org_valid() which does all org sanity checks * Fixes for ansibot - Changed default of use_proxy from true to false - Removed some commented out code - Updated documentation * Changes for ansibot - Removed requirement for state parameter. I may readd this. - Updated formatting diff --git a/lib/ansible/module_utils/network/meraki/meraki.py b/lib/ansible/module_utils/network/meraki/meraki.py index 3acd3d1038..395ac7c4b4 100644 --- a/lib/ansible/module_utils/network/meraki/meraki.py +++ b/lib/ansible/module_utils/network/meraki/meraki.py @@ -42,7 +42,7 @@ def meraki_argument_spec(): return dict(auth_key=dict(type='str', no_log=True, fallback=(env_fallback, ['MERAKI_KEY'])), host=dict(type='str', default='api.meraki.com'), name=dict(type='str'), - state=dict(type='str', choices=['present', 'absent', 'query'], required=True), + state=dict(type='str', choices=['present', 'absent', 'query']), use_proxy=dict(type='bool', default=False), use_https=dict(type='bool', default=True), validate_certs=dict(type='bool', default=True), diff --git a/lib/ansible/modules/network/meraki/meraki_organization.py b/lib/ansible/modules/network/meraki/meraki_organization.py index 923d969366..3789be91d6 100644 --- a/lib/ansible/modules/network/meraki/meraki_organization.py +++ b/lib/ansible/modules/network/meraki/meraki_organization.py @@ -20,11 +20,9 @@ short_description: Manage organizations in the Meraki cloud version_added: "2.6" description: - Allows for creation, management, and visibility into organizations within Meraki - notes: - More information about the Meraki API can be found at U(https://dashboard.meraki.com/api_docs). - Some of the options are likely only used for developers within Meraki - options: name: description: @@ -32,21 +30,18 @@ options: - If C(clone) is specified, C(name) is the name of the new organization. state: description: - - Create or query organizations - choices: ['query', 'present'] + - Create or modify an organization + choices: ['present', 'query'] clone: description: - Organization to clone to a new organization. - type: string org_name: description: - Name of organization. - Used when C(name) should refer to another object. - type: string org_id: description: - ID of organization - author: - Kevin Breit (@kbreit) extends_documentation_fragment: meraki @@ -86,7 +81,6 @@ RETURN = ''' response: description: Data returned from Meraki dashboard. type: dict - state: query returned: info ''' @@ -103,6 +97,7 @@ def main(): argument_spec = meraki_argument_spec() argument_spec.update(clone=dict(type='str'), + state=dict(type='str', choices=['present', 'query']), ) @@ -125,11 +120,9 @@ def main(): meraki.function = 'organizations' meraki.params['follow_redirects'] = 'all' - meraki.required_if=[ - ['state', 'present', ['name']], - ['clone', ['name']], - # ['vpn_PublicIP', ['name']], - ] + meraki.required_if = [['state', 'present', ['name']], + ['clone', ['name']], + ] create_urls = {'organizations': '/organizations', } @@ -162,23 +155,16 @@ def main(): - - # method = None - # org_id = None - - - # meraki.fail_json(msg=meraki.is_org_valid(meraki.get_orgs(), org_name='AnsibleTestOrg')) - if meraki.params['state'] == 'query': - if meraki.params['name'] is None: # Query all organizations, no matter what - orgs = meraki.get_orgs() - meraki.result['organization'] = orgs - elif meraki.params['name'] is not None: # Query by organization name - module.warn('All matching organizations will be returned, even if there are duplicate named organizations') - orgs = meraki.get_orgs() - for o in orgs: - if o['name'] == meraki.params['name']: - meraki.result['organization'] = o + if meraki.params['name'] is None: # Query all organizations, no matter what + orgs = meraki.get_orgs() + meraki.result['organization'] = orgs + elif meraki.params['name'] is not None: # Query by organization name + module.warn('All matching organizations will be returned, even if there are duplicate named organizations') + orgs = meraki.get_orgs() + for o in orgs: + if o['name'] == meraki.params['name']: + meraki.result['organization'] = o elif meraki.params['state'] == 'present': if meraki.params['clone'] is not None: # Cloning payload = {'name': meraki.params['name']} @@ -193,7 +179,10 @@ def main(): payload = {'name': meraki.params['name'], 'id': meraki.params['org_id'], } - meraki.result['response'] = json.loads(meraki.request(meraki.construct_path('update', org_id=meraki.params['org_id']), payload=json.dumps(payload), method='PUT')) + meraki.result['response'] = json.loads(meraki.request(meraki.construct_path('update', + org_id=meraki.params['org_id']), + payload=json.dumps(payload), + method='PUT')) diff --git a/lib/ansible/utils/module_docs_fragments/meraki.py b/lib/ansible/utils/module_docs_fragments/meraki.py index e268d02e68..3569d83b99 100644 --- a/lib/ansible/utils/module_docs_fragments/meraki.py +++ b/lib/ansible/utils/module_docs_fragments/meraki.py @@ -35,6 +35,7 @@ options: description: - Set amount of debug output during module execution choices: ['normal', 'debug'] + default: 'normal' timeout: description: - Time to timeout for HTTP requests. diff --git a/test/integration/targets/meraki_organization/aliases b/test/integration/targets/meraki_organization/aliases new file mode 100644 index 0000000000..ad7ccf7ada --- /dev/null +++ b/test/integration/targets/meraki_organization/aliases @@ -0,0 +1 @@ +unsupported * Formatting fix * Minor updates due to testing - Made state required again - Improved formatting for happier PEP8 - request() now sets instance method * Fix reporting of the result * Enhance idempotency checks - Remove merging functionality as the proposed should be used - Do check and reverse check to look for differences * Rewrote and added additional integration tests. This isn't done. * Updated is_update_required method: - Original and proposed data is passed to method - Added ignored_keys list so it can be skipped if needed * Changes per comments from dag - Optionally assign function on class instantiation - URLs now have {} for substitution method - Move auth_key check to module utility - Remove is_new and get_existing - Minor changes to documentation * Enhancements for future modules and organization - Rewrote construct_path method for simplicity - Increased support for network functionality to be committed * Changes based on Dag feedback and to debug problems * Minor fixes for validitation testing * Small changes for dag and Ansibot - Changed how auth_key is processed - Removed some commented lines - Updated documentation fragment, but that may get reverted * Remove blank line and comment * Improvements for testing and code simplification - Added network integration tests - Modified error handling in request() - More testing to come on this - Rewrote construct_path again. Very simple now. * Remove trailing whitespace * Small changes based on dag's response * Removed certain sections from exit_json and fail_json as they're old	7 years ago
Matt Clay	c2d7347819	Enable nuage_vspk tests for Python 2.7.	7 years ago
Julien Vey	a6d5656dd8	ec2_instance: add a retry to run_instance to help with ec2 consistency	7 years ago
Julien PRIGENT	1905a6e8fb	ec2_vpc_route_table: Update matching_count parsing on find_subnets fu… (#38707 ) * ec2_vpc_route_table: Update matching_count parsing on find_subnets function and tests * ec2_vpc_route_table: Update matching_count parsing on find_subnets function	7 years ago
Matt Martz	aeecdbfc35	Restore previous test play, break new tests into a new play (#39688 )	7 years ago
John R Barker	62b03d93bc	Use ansible-test, not nxos.yaml (#39692 )	7 years ago
Sloane Hertel	923f676836	[ec2_vpc_vgw] [ec2_vpc_vpn] stabilize modules for PR 35983 (#38666 ) * Stabilize ec2_vpc_vgw and ec2_vpc_vpn so tests for ec2_vpc_vpn_facts in PR 35983 can be run in CI * Add updated placebo recordings * ensure find_vgw uses the virtual gateway id if available Add AWSRetry.jittered_backoff to attach_vpn_gateway to deal with errors when attaching a new VPC directly after detaching Add integrations tests for ec2_vpc_vgw * Sort VPN Gateways by ID	7 years ago
John R Barker	923a81e9e5	vyos_interface require multiple network nodes to run (#39670 ) * vyos_interface require multiple network nodes to run We don't have the ability to run these currently, so disable them. The original logic was also incorrect, the tests don't pass on lab, DCI nor single instance nodepool, so disable https://github.com/ansible/ansible/issues/39667 tracks getting these enabled again * eth0 -> Gi0/0 * Correctly detect if we should run lldp * Correctly detect if we should run lldp	7 years ago
saichint	f99bae1776	Fix for nxos_snmp_host issues (#39642 ) * fix snmp_host issues * source files * fix shippable * remove defaults to match arg spec	7 years ago
saichint	99748cbfa4	fix nxos_snmp_traps issues (#39444 ) * fix snmp_traps code * add IT cases * fix shippable * fix shippable without ignore	7 years ago
Adam Miller	d49a09d05e	fix sanity checks to make shippable happy (#39685 ) Signed-off-by: Adam Miller <admiller@redhat.com>	7 years ago
Seuf	cc477ba8cc	Don't split line when no version available for plugin (#37907 ) * Don't split line when no version available for plugin * Fixed author github account	7 years ago
scottb	0c0dc8d9fc	Adds documentation structure and stubs for new VMWare guide (#39246 ) * Adding initial skeleton of VMWare docs * Updated product name capitaliztion; ready for initial PR. * Add few files and updated some links Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com> * Fixed duplicate anchor tag	7 years ago
Mário Santos	947aa52327	Add new OpenStack module for managing cinder volume snapshots (#19122 ) * Add os_volume_snapshot Ansible Module * Add missing RETURN documentation * Fix YAML syntax * Add ANSIBLE_METADATA Signed-off-by: Mário Santos <mario.rf.santos@gmail.com> * Bump the ansible version Signed-off-by: Mário Santos <mario.rf.santos@gmail.com> * Add support for check_mode Signed-off-by: Mário Santos <mario.rf.santos@gmail.com> * Fix sanity tests Signed-off-by: Mário Santos <mario.rf.santos@gmail.com>	7 years ago
John R Barker	a7660f0603	Default ssh port (#39678 )	7 years ago
Toshio Kuratomi	1885883a88	Document follow changes Add the file, blockinfile, and replace changes to the follow parameter to the porting guide	7 years ago
Sloane Hertel	151f9d2ebf	[cloud] aws_direct_connect_connection: improve return docs (#37677 ) Fixes #29381 Fix uses of AWSRetry Fix exception handling Update module to use AnsibleAWSModule	7 years ago
Will Thames	29770a297a	Fail with nice error message if elb target_type=ip not supported (#38313 ) * Add helpful failure message if target_type=ip is not supported Create test case for target_type=ip not supported * Update elb_target_group module to latest standards Use AnsibleAWSModule Improve exception handling Improve connection handling	7 years ago
wang shuang	918b29f0fc	[doc] fix a typo in ec2_eni docs (#36571 )	7 years ago
Will Thames	b5488b4e45	Change aws_acm_facts name parameter to be domain_name (#36986 ) Match AWS's naming for domain name, but provide backward compatible alias.	7 years ago
Felix Fontein	cb4db82354	Route53 check mode (#37273 ) * Adding check mode for route53. * flake8	7 years ago
Vinay Dandekar	ada2ea4387	Fix ec2_metadata_facts documentation (#37546 ) - ec2_metadata_facts does not extend `url` - Remove url_argument_spec for ec2_metadata_facts	7 years ago
Will Thames	261ad0aa87	[aws] Improve integration test suite for cloudfront (#37813 ) Improve naming of one of the cloudfront tasks Change test_identifier back to resource_prefix now it's always lower case. More tests around using distribution_id and default_root_object	7 years ago
cahlchang	e2908ae8df	[aws] Add aws_iam_role check mode support (#39002 ) * Check mode when adding * Check mode when deleting * Add check mode	7 years ago
Sloane Hertel	910bc892c6	ec2_ami: Properly delete snapshots (#39606 )	7 years ago
Ganesh Nalawade	afdc2364f2	Fix eos_vlan associated interface check (#39661 ) * Fix eos_vlan associated interface check Fix eos_vlan associated interface check by comparing the interface in want and have without converting the interface name to lower * Update eos_vlan docs	7 years ago
Ganesh Nalawade	b20b964c4a	Fix eos_config integration test failure (#39662 ) Enable become for eos_config check_mode test cases	7 years ago
Loïc Blot	88df583af7	New module: AWS storage gateway facts (#39491 ) * Add a module to get storage gateway facts * Review fixes * Last review fixes * Add filtering gathering & some fixes * doc fix * API error handling * Remove ec2_argument_spec import Use imported BotoCoreError and ClientError rather than botocore.exceptions	7 years ago
Sam Doran	f872b70449	Remove skipping of never tag since it is done automatically (#39643 )	7 years ago
aaronk1	ca36e07be0	update win_psmodule.py (#39631 ) <!--- Fix minor typo in Powershell version requirement --> +label: docsite_pr	7 years ago
Daryl Banttari	e0893aacc5	[ec2 contrib script] Add ability to filter EC2 instances via shell environment (#39034 )	7 years ago
vab2048	8d84039aa8	[ec2_vpc_route_table] Use 'network_interface_id' rather than 'interface_id' (#38499 ) Updated documentation to refer to 'network_interface_id' rather than 'interface_id' as the latter results in an error: 'Parameter validation failed: Unknown parameter in input: \"InterfaceId\"'	7 years ago
Sylvain Rabot	521cc3d4e6	[contrib] azure_rm.py add mechanism to force use of private ip as ansible_host (#36109 ) Signed-off-by: Sylvain Rabot <s.rabot@lectra.com>	7 years ago
Matt Davis	31bfb7b563	Remove dharmabumstead from docs review pings	7 years ago
Alex Stephen	b6aa132033	New module: GCP Compute Backend Services (#38611 )	7 years ago
Alex Stephen	394abba1b9	New module: GCP Compute Backend Buckets (#38610 )	7 years ago
Matt Clay	472c586563	Enable xml integration test. (#39629 )	7 years ago
Ryan S. Brown	9a607283aa	Terraform module: pass `plan_file` argument correctly Per #39611 the `terraform` module wasn't properly building plan-only files.	7 years ago
Abhijit Menon-Sen	0a119c391a	Only expand '~' based on become_user/remote_user Change brought forward from #00c023e in stable-2.5. Closes #39281 (bug report) Closes #39540 (PR with substantially the same change)	7 years ago
Matt Clay	f526a461ee	Remove unstable marker from rabbitmq_user test.	7 years ago
Brian Coca	70d89b5487	use actual ssh executable as it might not be ssh	7 years ago
wznoinsk	f2db9d59c7	Update set_stats.py <!--- Your description here --> +label: docsite_pr	7 years ago

... 3 4 5 6 7 ...

37330 Commits (def434b5c3ed5571c27477147a587b6359021792) All Branches Search

37330 Commits (def434b5c3ed5571c27477147a587b6359021792)

All Branches