diff --git a/CHANGELOG.md b/CHANGELOG.md index 2be8985..2305326 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,11 +2,30 @@ **Topics** +- v1\.1\.1 + - Minor Changes + - Breaking Changes / Porting Guide - v1\.1\.0 - Release Summary - New Plugins - Lookup + +## v1\.1\.1 + + +### Minor Changes + +* configure\_meraki\_mv \- Updated data handling for MQTT configuration with camera sense\. + + +### Breaking Changes / Porting Guide + +* configure\_meraki\_mr \- Data model updated to support migration to latest cisco\.meraki certified collection\. +* configure\_meraki\_mt \- Data model updated to support migration to latest cisco\.meraki certified collection\. +* configure\_meraki\_mv \- Data model updated to support migration to latest cisco\.meraki certified collection\. +* configure\_meraki\_mx \- Data model updated to support migration to latest cisco\.meraki certified collection\. + ## v1\.1\.0 diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 03fa4ee..4ea296c 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -1,11 +1,31 @@ ancestor: null releases: 1.1.0: - release_date: '2024-05-30' changes: - release_summary: This release includes updates to support the certified cisco.meraki content collection. + release_summary: This release includes updates to support the certified cisco.meraki + content collection. plugins: lookup: - - description: Fetch data from the Meraki API. - name: fetch - namespace: null + - description: Fetch data from the Meraki API. + name: fetch + namespace: null + release_date: '2024-05-30' + 1.1.1: + changes: + breaking_changes: + - configure_meraki_mr - Data model updated to support migration to latest cisco.meraki + certified collection. + - configure_meraki_mt - Data model updated to support migration to latest cisco.meraki + certified collection. + - configure_meraki_mv - Data model updated to support migration to latest cisco.meraki + certified collection. + - configure_meraki_mx - Data model updated to support migration to latest cisco.meraki + certified collection. + minor_changes: + - configure_meraki_mv - Updated data handling for MQTT configuration with camera + sense. + fragments: + - 1.1.0-docs.yaml + - 1.1.0-update.yaml + - 1.1.1-minor.yaml + release_date: '2024-05-30' diff --git a/changelogs/fragments/1.1.0-docs.yaml b/changelogs/fragments/1.1.0-docs.yaml deleted file mode 100644 index 6c50b9b..0000000 --- a/changelogs/fragments/1.1.0-docs.yaml +++ /dev/null @@ -1,7 +0,0 @@ -trivial: - - claim_meraki - Moved README to docs/CLAIM_MERAKI.md and updated README.md - - configure_meraki_mx - Moved README to docs/CONFIGURE_MERAKI_MX.md and updated README.md - - configure_meraki_mr - Moved README to docs/CONFIGURE_MERAKI_MR.md and updated README.md - - configure_meraki_mt - Moved README to docs/CONFIGURE_MERAKI_MT.md and updated README.md - - configure_meraki_mv - Moved README to docs/CONFIGURE_MERAKI_MV.md and updated README.md - - manage_meraki_network - Moved README to docs/MANAGE_MERAKI_NETWORK.md and updated README.md diff --git a/changelogs/fragments/1.1.0-update.yaml b/changelogs/fragments/1.1.0-update.yaml deleted file mode 100644 index 9bd371e..0000000 --- a/changelogs/fragments/1.1.0-update.yaml +++ /dev/null @@ -1,5 +0,0 @@ -breaking_changes: - - configure_meraki_mx - Data model updated to support migration to latest cisco.meraki certified collection. - - configure_meraki_mr - Data model updated to support migration to latest cisco.meraki certified collection. - - configure_meraki_mt - Data model updated to support migration to latest cisco.meraki certified collection. - - configure_meraki_mv - Data model updated to support migration to latest cisco.meraki certified collection. diff --git a/galaxy.yml b/galaxy.yml index be41af3..742e7c8 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.0 +version: 1.1.1 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection readme: README.md diff --git a/roles/configure_meraki_mv/tasks/configure_camera_settings.yml b/roles/configure_meraki_mv/tasks/configure_camera_settings.yml index 804a262..3b290a2 100644 --- a/roles/configure_meraki_mv/tasks/configure_camera_settings.yml +++ b/roles/configure_meraki_mv/tasks/configure_camera_settings.yml @@ -122,7 +122,8 @@ serial: "{{ device_serial }}" state: "{{ camera.state }}" senseEnabled: "{{ camera.sense.senseEnabled | default(omit) }}" - mqttBrokerId: "{{ mqtt_broker_ids[camera.sense.mqttBrokerName].id | default(omit) }}" + mqttBrokerId: '{{ camera.sense["mqttBrokerName"] is defined + | ternary(mqtt_broker_ids[camera.sense.get("mqttBrokerName")].id, omit) }}' audioDetection: "{{ ((camera.sense.audioDetection is defined) and (camera.sense.audioDetection.enabled) and (camera.sense.senseEnabled))