diff --git a/.gitignore b/.gitignore
index 4d974b5..959d0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,4 +162,4 @@ scratch/
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
-changelogs/.plugin_cache.yaml
\ No newline at end of file
+changelogs/.plugin-cache.yaml
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f1c1e2..7677f58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,9 +2,11 @@
**Topics**
+- v1\.1\.3
+ - Bugfixes
- v1\.1\.2
- Breaking Changes / Porting Guide
- - Bugfixes
+ - Bugfixes
- v1\.1\.1
- Minor Changes
- Breaking Changes / Porting Guide
@@ -13,6 +15,14 @@
- New Plugins
- Lookup
+
+## v1\.1\.3
+
+
+### Bugfixes
+
+* configure\_meraki\_mx \- Fixed VLAN provisioning to match requirements with cisco\.meraki collection version 2\.18\.1
+
## v1\.1\.2
@@ -21,7 +31,7 @@
* manage\_meraki\_network \- updated data model so that tags are now a list
-
+
### Bugfixes
* configure\_meraki\_mt \- fixed conditional preventing lookup dictionary creation
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index b5b7204..f94b021 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -42,3 +42,11 @@ releases:
- v1.1.2-breaking.yaml
- v1.1.2-bugfixes.yaml
release_date: '2024-05-31'
+ 1.1.3:
+ changes:
+ bugfixes:
+ - configure_meraki_mx - Fixed VLAN provisioning to match requirements with cisco.meraki
+ collection version 2.18.1
+ fragments:
+ - v1.1.3-bugfixes.yaml
+ release_date: '2024-05-31'
diff --git a/galaxy.yml b/galaxy.yml
index 50d0aac..f1f3e78 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -9,7 +9,7 @@ namespace: wwt
name: meraki
# The version of the collection. Must be compatible with semantic versioning
-version: 1.1.2
+version: 1.1.3
# The path to the Markdown (.md) readme file. This path is relative to the root of the collection
readme: README.md
@@ -44,7 +44,7 @@ tags:
# collection label 'namespace.name'. The value is a version range
# L(specifiers,https://python-semanticversion.readthedocs.io/en/latest/#requirement-specification). Multiple version
# range specifiers can be set and are separated by ','
-dependencies: { cisco.meraki: ">=2.18.0" }
+dependencies: { cisco.meraki: ">=2.18.1" }
# The URL of the originating SCM repository
repository: https://github.com/wwt/meraki_collection
diff --git a/roles/configure_meraki_mx/tasks/configure_vlans.yml b/roles/configure_meraki_mx/tasks/configure_vlans.yml
index bc9157f..ba02920 100644
--- a/roles/configure_meraki_mx/tasks/configure_vlans.yml
+++ b/roles/configure_meraki_mx/tasks/configure_vlans.yml
@@ -16,11 +16,6 @@
#
# First pass configuration throws the following errors when run
-# when vlanId parameter is omitted:
-# Error: Appliance.getNetworkApplianceVlan() missing 1 required positional argument: 'vlanId'
-#
-# When vlanId parameter is present:
-# Error: An error occured when executing operation.
# The error was: appliance, getNetworkApplianceVlan - 404 Not Found, please wait a minute if the key or org was just newly created.
#
# VLANs are provisioned correctly regardless of error as noted above
@@ -32,7 +27,6 @@
state: "{{ vlan.state }}"
networkId: "{{ network_id }}"
id: "{{ vlan.id }}"
- vlanId: "{{ vlan.id }}"
name: "{{ vlan.name | default(omit) }}"
subnet: "{{ vlan.subnet | default(omit) }}"
applianceIp: "{{ vlan.appliance_ip | default(omit) }}"
@@ -46,7 +40,7 @@
meraki_api_key: "{{ auth_key }}"
state: "{{ vlan.state }}"
networkId: "{{ network_id }}"
- vlanId: "{{ vlan.id }}"
+ id: "{{ vlan.id }}"
name: "{{ vlan.name | default(omit) }}"
reservedIpRanges: "{{ vlan.reserved_ip_range | default(omit) }}"
fixedIpAssignments: "{{ vlan.fixed_ip_assignments | default(omit) }}"
@@ -66,7 +60,7 @@
meraki_api_key: "{{ auth_key }}"
state: "{{ vlan.state }}"
networkId: "{{ network_id }}"
- vlanId: "{{ vlan.id }}"
+ id: "{{ vlan.id }}"
name: "{{ vlan.name | default(omit) }}"
subnet: "{{ vlan.subnet | default(omit) }}"
applianceIp: "{{ vlan.appliance_ip | default(omit) }}"