Skip to content

Commit

Permalink
Merge pull request #80 from meraki/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
fmunozmiranda authored Jan 7, 2025
2 parents ed03fb6 + 2c8b5c9 commit fc7c730
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/sanity_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
ansible:
- stable-2.15
- stable-2.16
- stable-2.17
- stable-2.18
- devel
runs-on: ubuntu-20.04
steps:
Expand Down
14 changes: 9 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ The Meraki-Ansible project provides an Ansible collection for managing and autom
## Installation
1. Ansible must be installed ([Install guide](https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html))
```
pip install ansible
pip install ansible-core
```

2. Python Meraki SDK must be installed
Expand Down Expand Up @@ -122,7 +122,7 @@ The modules that were there before, usually with a `meraki` prefix, are maintain

### Example
- Old module:
```yml
```
- name: Create webhook
cisco.meraki.meraki_webhook:
auth_key: abc123
Expand All @@ -134,9 +134,9 @@ The modules that were there before, usually with a `meraki` prefix, are maintain
shared_secret: shhhdonttellanyone
payload_template_name: 'Slack (included)'
delegate_to: localhost
```
```
- New module:
```yml
```
- name: Create webhook
cisco.meraki.networks_webhooks_http_servers:
meraki_api_key: "{{meraki_api_key}}"
Expand All @@ -148,4 +148,8 @@ The modules that were there before, usually with a `meraki` prefix, are maintain
payloadTemplateId: wpt_00001
sharedSecret: shhhdonttellanyone
url: https://webhook.url/
```
```

## License

This project is licensed under the [GNU General Public License](https://github.com/meraki/dashboard-api-ansible/blob/main/LICENSE).
2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
namespace: cisco
name: meraki
version: 2.20.2
version: 2.20.3
readme: README.md
authors:
- Francisco Muñoz <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/devices_blink_leds.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
short_description: Resource module for devices _blink _leds
description:
- Manage operation create of the resource devices _blink _leds.
- Blink the LEDs on a device. This endpoint is deprecrated in favor of "/devices/{serial}/liveTools/leds/blink".
- Blink the LEDs on a device. This endpoint is deprecrated in favor of /devices/{serial}/liveTools/leds/blink.
version_added: '2.16.0'
extends_documentation_fragment:
- cisco.meraki.module
Expand Down
2 changes: 1 addition & 1 deletion plugins/plugin_utils/meraki.py
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ def __init__(self, params):
suppress_logging=params.get("meraki_suppress_logging"),
simulate=params.get("meraki_simulate"),
be_geo_id=params.get("meraki_be_geo_id"),
caller="MerakiAnsibleCollection/2.20.2 Cisco",
caller="MerakiAnsibleCollection/2.20.3 Cisco",
use_iterator_for_get_pages=params.get(
"meraki_use_iterator_for_get_pages"),
inherit_logging_config=params.get(
Expand Down

0 comments on commit fc7c730

Please sign in to comment.