Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/sanity_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.11'
python-version: '3.12'
- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
- name: Run sanity tests
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ Cisco.Meraki Release Notes

.. contents:: Topics

v2.21.5
=======

Bugfixes
--------

- cisco.meraki.devices_appliance_uplinks_settings - fix idempotency error.

v2.21.4
=======

Expand Down
5 changes: 5 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1267,3 +1267,8 @@ releases:
bugfixes:
- cisco.meraki.networks_appliance_traffic_shaping_uplink_bandwidth - fix idempotency error.
release_date: "2025-06-10"
2.21.5:
changes:
bugfixes:
- cisco.meraki.devices_appliance_uplinks_settings - fix idempotency error.
release_date: "2025-09-11"
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.21.4
version: 2.21.5
readme: README.md
authors:
- Francisco Muñoz <[email protected]>
Expand Down
26 changes: 26 additions & 0 deletions playbooks/devices_appliance_uplinks_settings.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
- name: Devices Appliance Uplinks Settings
hosts: localhost
gather_facts: false
tasks:

- name: Set MX WAN 1 IP
cisco.meraki.devices_appliance_uplinks_settings:
state: present
meraki_suppress_logging: false
interfaces:
wan1:
enabled: false
pppoe:
enabled: false
svis:
ipv4:
address: 3.2.3.4/28
assignmentMode: static
gateway: 3.2.3.1
nameservers:
addresses:
- 8.8.8.8
- 1.1.1.1
vlanTagging:
enabled: false
serial: QBSA-D8CD-5LR6
5 changes: 0 additions & 5 deletions plugins/action/devices_appliance_uplinks_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
MERAKI,
meraki_argument_spec,
meraki_compare_equality2,
get_dict_result,
)
from ansible_collections.cisco.meraki.plugins.plugin_utils.exceptions import (
InconsistentParameters,
Expand Down Expand Up @@ -77,10 +76,6 @@ def get_object_by_name(self, name):
function="getDeviceApplianceUplinksSettings",
params=self.get_all_params(name=name),
)
if isinstance(items, dict):
if 'interfaces' in items:
items = items.get('interfaces')
result = get_dict_result(items, 'name', name)
if result is None:
result = items
except Exception as e:
Expand Down
6 changes: 3 additions & 3 deletions workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ jobs:
docs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: configure git
run: |
git config user.name "${GITHUB_ACTOR}"
git config user.email "${GITHUB_ACTOR}@bots.github.com"
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: "3.7"
python-version: "3.12"
- name: Install dependencies
run: make doc-setup
- name: Build docs
Expand Down
10 changes: 5 additions & 5 deletions workflows/sanity_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@ jobs:
strategy:
matrix:
ansible:
- stable-2.10
- stable-2.11
- stable-2.15
- stable-2.16
runs-on: ubuntu-latest
steps:
- name: Check out code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
path: meraki/meraki-ansible
- name: Create directory
run: mkdir -p ./ansible_collections/${{env.NAMESPACE}}
- name: Move repository
run: mv ./meraki/meraki-ansible ./ansible_collections/${{env.NAMESPACE}}/${{env.COLLECTION_NAME}}
- name: Set up Python
uses: actions/setup-python@v2
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: 3.12
- name: Install ansible-base (${{ matrix.ansible }})
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
- name: Run sanity tests
Expand Down