revert changelog to pre v8.0.0 to make changes via antsibull-changelo…

…g consistent (#1086) * revert changelog * file end * Revert changelog * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Added vlan PR --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
ansible-collections · Jun 11, 2024 · bd48738 · bd48738
1 parent 9e9f6e6
commit bd48738
Show file tree

Hide file tree

Showing 3 changed files with 113 additions and 72 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -38,6 +38,7 @@ Bugfixes
 - ios_service - Add tcp_small_servers and udp_small_servers attributes, to generate configuration.
 - ios_service - Fix timestamps attribute, to generate right configuration.
 - ios_static_routes - Fix gathering facts by properly distinguising routes.
+- l2_interfaces - If a large number of VLANs are affected, the configuration will now be correctly split into several commands.
 - snmp_server - Fix configuration command for snmp-server host.
 - snmp_server - Fix wrong syntax of snmp-server host command generation.
 
@@ -727,7 +728,7 @@ Documentation Changes
 New Modules
 -----------
 
-- ios_hostname - Resource module to configure hostname.
+- ios_hostname - hostname resource module
 
 v2.6.0
 ======
@@ -758,7 +759,7 @@ Documentation Changes
 New Modules
 -----------
 
-- ios_snmp_server - Resource module to configure snmp server.
+- ios_snmp_server - snmp_server resource module
 
 v2.5.0
 ======
@@ -791,7 +792,7 @@ Documentation Changes
 New Modules
 -----------
 
-- ios_ntp_global - Resource module to configure NTP.
+- ios_ntp_global - ntp_global resource module
 
 v2.4.0
 ======
@@ -878,8 +879,8 @@ Bugfixes
 New Modules
 -----------
 
-- ios_logging_global - Resource module to configure logging.
-- ios_prefix_lists - Resource module to configure prefix lists.
+- ios_logging_global - Logging resource module.
+- ios_prefix_lists - Prefix Lists resource module.
 
 v2.1.0
 ======
@@ -903,7 +904,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_route_maps - Resource module to configure route maps.
+- ios_route_maps - Route Maps resource module.
 
 v2.0.1
 ======
@@ -948,7 +949,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_bgp_address_family - Resource module to configure BGP Address family.
+- ios_bgp_address_family - BGP Address Family resource module.
 
 v1.3.0
 ======
@@ -971,7 +972,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_bgp_global - Resource module to configure BGP.
+- ios_bgp_global - BGP Global resource module
 
 v1.2.1
 ======
@@ -1002,7 +1003,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_ospf_interfaces - Resource module to configure OSPF interfaces.
+- ios_ospf_interfaces - OSPF Interfaces resource module
 
 v1.1.0
 ======
@@ -1023,7 +1024,7 @@ Bugfixes
 New Modules
 -----------
 
-- ios_ospfv3 - Resource module to configure OSPFv3.
+- ios_ospfv3 - OSPFv3 resource module
 
 v1.0.3
 ======
@@ -1075,26 +1076,34 @@ Cliconf
 New Modules
 -----------
 
-- ios_acl_interfaces - Resource module to configure ACL interfaces.
-- ios_acls - Resource module to configure ACLs.
-- ios_banner - Module to configure multiline banners.
-- ios_command - Module to run commands on remote devices.
-- ios_config - Module to manage configuration sections.
-- ios_facts - Module to collect facts from remote devices.
-- ios_interfaces - Resource module to configure interfaces.
-- ios_l2_interfaces - Resource module to configure L2 interfaces.
-- ios_l3_interfaces - Resource module to configure L3 interfaces.
-- ios_lacp - Resource module to configure LACP.
-- ios_lacp_interfaces - Resource module to configure LACP interfaces.
-- ios_lag_interfaces - Resource module to configure LAG interfaces.
-- ios_linkagg - Module to configure link aggregation groups.
-- ios_lldp - (deprecated, removed after 2024-06-01) Manage LLDP configuration on Cisco IOS network devices.
-- ios_lldp_global - Resource module to configure LLDP.
-- ios_lldp_interfaces - Resource module to configure LLDP interfaces.
-- ios_ospfv2 - Resource module to configure OSPFv2.
-- ios_ping - Tests reachability using ping from IOS switch.
-- ios_static_routes - Resource module to configure static routes.
-- ios_system - Module to manage the system attributes.
-- ios_user - Module to manage the aggregates of local users.
-- ios_vlans - Resource module to configure VLANs.
-- ios_vrf - Module to configure VRF definitions.
+- ios_acl_interfaces - ACL interfaces resource module
+- ios_acls - ACLs resource module
+- ios_banner - Manage multiline banners on Cisco IOS devices
+- ios_bgp - Configure global BGP protocol settings on Cisco IOS.
+- ios_command - Run commands on remote devices running Cisco IOS
+- ios_config - Manage Cisco IOS configuration sections
+- ios_facts - Collect facts from remote devices running Cisco IOS
+- ios_interface - (deprecated, removed after 2022-06-01) Manage Interface on Cisco IOS network devices
+- ios_interfaces - Interfaces resource module
+- ios_l2_interface - (deprecated, removed after 2022-06-01) Manage Layer-2 interface on Cisco IOS devices.
+- ios_l2_interfaces - L2 interfaces resource module
+- ios_l3_interface - (deprecated, removed after 2022-06-01) Manage Layer-3 interfaces on Cisco IOS network devices.
+- ios_l3_interfaces - L3 interfaces resource module
+- ios_lacp - LACP resource module
+- ios_lacp_interfaces - LACP interfaces resource module
+- ios_lag_interfaces - LAG interfaces resource module
+- ios_linkagg - Manage link aggregation groups on Cisco IOS network devices
+- ios_lldp - Manage LLDP configuration on Cisco IOS network devices.
+- ios_lldp_global - LLDP resource module
+- ios_lldp_interfaces - LLDP interfaces resource module
+- ios_logging - Manage logging on network devices
+- ios_ntp - Manages core NTP configuration.
+- ios_ospfv2 - OSPFv2 resource module
+- ios_ping - Tests reachability using ping from Cisco IOS network devices
+- ios_static_route - (deprecated, removed after 2022-06-01) Manage static IP routes on Cisco IOS network devices
+- ios_static_routes - Static routes resource module
+- ios_system - Manage the system attributes on Cisco IOS devices
+- ios_user - Manage the aggregate of local users on Cisco IOS device
+- ios_vlan - (deprecated, removed after 2022-06-01) Manage VLANs on IOS network devices
+- ios_vlans - VLANs resource module
+- ios_vrf - Manage the collection of VRF definitions on Cisco IOS devices
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -2,75 +2,107 @@ ancestor: null
 releases:
   1.0.0:
     modules:
-      - description: Resource module to configure ACL interfaces.
+      - description: ACL interfaces resource module
         name: ios_acl_interfaces
         namespace: ""
-      - description: Resource module to configure ACLs.
+      - description: ACLs resource module
         name: ios_acls
         namespace: ""
-      - description: Module to configure multiline banners.
+      - description: Manage multiline banners on Cisco IOS devices
         name: ios_banner
         namespace: ""
-      - description: Module to run commands on remote devices.
+      - description: Configure global BGP protocol settings on Cisco IOS.
+        name: ios_bgp
+        namespace: ""
+      - description: Run commands on remote devices running Cisco IOS
         name: ios_command
         namespace: ""
-      - description: Module to manage configuration sections.
+      - description: Manage Cisco IOS configuration sections
         name: ios_config
         namespace: ""
-      - description: Module to collect facts from remote devices.
+      - description: Collect facts from remote devices running Cisco IOS
         name: ios_facts
         namespace: ""
-      - description: Resource module to configure interfaces.
+      - description:
+          (deprecated, removed after 2022-06-01) Manage Interface on Cisco
+          IOS network devices
+        name: ios_interface
+        namespace: ""
+      - description: Interfaces resource module
         name: ios_interfaces
         namespace: ""
-      - description: Resource module to configure L2 interfaces.
+      - description:
+          (deprecated, removed after 2022-06-01) Manage Layer-2 interface
+          on Cisco IOS devices.
+        name: ios_l2_interface
+        namespace: ""
+      - description: L2 interfaces resource module
         name: ios_l2_interfaces
         namespace: ""
-      - description: Resource module to configure L3 interfaces.
+      - description:
+          (deprecated, removed after 2022-06-01) Manage Layer-3 interfaces
+          on Cisco IOS network devices.
+        name: ios_l3_interface
+        namespace: ""
+      - description: L3 interfaces resource module
         name: ios_l3_interfaces
         namespace: ""
-      - description: Resource module to configure LACP.
+      - description: LACP resource module
         name: ios_lacp
         namespace: ""
-      - description: Resource module to configure LACP interfaces.
+      - description: LACP interfaces resource module
         name: ios_lacp_interfaces
         namespace: ""
-      - description: Resource module to configure LAG interfaces.
+      - description: LAG interfaces resource module
         name: ios_lag_interfaces
         namespace: ""
-      - description: Module to configure link aggregation groups.
+      - description: Manage link aggregation groups on Cisco IOS network devices
         name: ios_linkagg
         namespace: ""
-      - description:
-          (deprecated, removed after 2024-06-01) Manage LLDP configuration
-          on Cisco IOS network devices.
+      - description: Manage LLDP configuration on Cisco IOS network devices.
         name: ios_lldp
         namespace: ""
-      - description: Resource module to configure LLDP.
+      - description: LLDP resource module
         name: ios_lldp_global
         namespace: ""
-      - description: Resource module to configure LLDP interfaces.
+      - description: LLDP interfaces resource module
         name: ios_lldp_interfaces
         namespace: ""
-      - description: Resource module to configure OSPFv2.
+      - description: Manage logging on network devices
+        name: ios_logging
+        namespace: ""
+      - description: Manages core NTP configuration.
+        name: ios_ntp
+        namespace: ""
+      - description: OSPFv2 resource module
         name: ios_ospfv2
         namespace: ""
-      - description: Tests reachability using ping from IOS switch.
+      - description: Tests reachability using ping from Cisco IOS network devices
         name: ios_ping
         namespace: ""
-      - description: Resource module to configure static routes.
+      - description:
+          (deprecated, removed after 2022-06-01) Manage static IP routes
+          on Cisco IOS network devices
+        name: ios_static_route
+        namespace: ""
+      - description: Static routes resource module
         name: ios_static_routes
         namespace: ""
-      - description: Module to manage the system attributes.
+      - description: Manage the system attributes on Cisco IOS devices
         name: ios_system
         namespace: ""
-      - description: Module to manage the aggregates of local users.
+      - description: Manage the aggregate of local users on Cisco IOS device
         name: ios_user
         namespace: ""
-      - description: Resource module to configure VLANs.
+      - description:
+          (deprecated, removed after 2022-06-01) Manage VLANs on IOS network
+          devices
+        name: ios_vlan
+        namespace: ""
+      - description: VLANs resource module
         name: ios_vlans
         namespace: ""
-      - description: Module to configure VRF definitions.
+      - description: Manage the collection of VRF definitions on Cisco IOS devices
         name: ios_vrf
         namespace: ""
     plugins:
@@ -121,7 +153,7 @@ releases:
       minor_changes:
         - Add ios_ospfv3 module.
     modules:
-      - description: Resource module to configure OSPFv3.
+      - description: OSPFv3 resource module
         name: ios_ospfv3
         namespace: ""
     release_date: "2020-10-01"
@@ -140,7 +172,7 @@ releases:
       minor_changes:
         - Add ios_ospf_interfaces module.
     modules:
-      - description: Resource module to configure OSPF interfaces.
+      - description: OSPF Interfaces resource module
         name: ios_ospf_interfaces
         namespace: ""
     release_date: "2020-11-01"
@@ -164,7 +196,7 @@ releases:
       minor_changes:
         - Add ios_bgp_global module.
     modules:
-      - description: Resource module to configure BGP.
+      - description: BGP Global resource module
         name: ios_bgp_global
         namespace: ""
     release_date: "2021-01-29"
@@ -182,7 +214,7 @@ releases:
         - Add ios_bgp_address_family Resource Module. (https://github.com/ansible-collections/cisco.ios/pull/219).
         - Adds support for single_user_mode command output caching. (https://github.com/ansible-collections/cisco.ios/pull/204).
     modules:
-      - description: Resource module to configure BGP Address family.
+      - description: BGP Address Family resource module.
         name: ios_bgp_address_family
         namespace: ""
     release_date: "2021-02-25"
@@ -214,7 +246,7 @@ releases:
       security_fixes:
         - To fix Cisco IOS no log issue and add ignore txt for 2.12 (https://github.com/ansible-collections/cisco.ios/pull/304).
     modules:
-      - description: Resource module to configure route maps.
+      - description: Route Maps resource module.
         name: ios_route_maps
         namespace: ""
     release_date: "2021-04-27"
@@ -233,10 +265,10 @@ releases:
         - Add ios_logging_global module.
         - IOS Prefix list resource module.
     modules:
-      - description: Resource module to configure logging.
+      - description: Logging resource module.
         name: ios_logging_global
         namespace: ""
-      - description: Resource module to configure prefix lists.
+      - description: Prefix Lists resource module.
         name: ios_prefix_lists
         namespace: ""
     release_date: "2021-05-18"
@@ -345,7 +377,7 @@ releases:
       - sd_wan_support.yaml
       - set_allow_duplicates.yaml
     modules:
-      - description: Resource module to configure NTP.
+      - description: ntp_global resource module
         name: ios_ntp_global
         namespace: ""
     release_date: "2021-09-24"
@@ -377,7 +409,7 @@ releases:
       - sanity-213.yaml
       - snmp_server_resource_module.yaml
     modules:
-      - description: Resource module to configure snmp server.
+      - description: snmp_server resource module
         name: ios_snmp_server
         namespace: ""
     release_date: "2021-12-07"
@@ -420,7 +452,7 @@ releases:
       - snmp_server_feature_user.yaml
       - static_route_interface_issue.yaml
     modules:
-      - description: Resource module to configure hostname.
+      - description: hostname resource module
         name: ios_hostname
         namespace: ""
     release_date: "2022-01-31"
@@ -1169,6 +1201,8 @@ releases:
           configuration.
         - ios_service - Fix timestamps attribute, to generate right configuration.
         - ios_static_routes - Fix gathering facts by properly distinguising routes.
+        - l2_interfaces - If a large number of VLANs are affected, the configuration
+          will now be correctly split into several commands.
         - snmp_server - Fix configuration command for snmp-server host.
         - snmp_server - Fix wrong syntax of snmp-server host command generation.
       deprecated_features:
@@ -1195,10 +1229,11 @@ releases:
       - ios_acls_udp.yml
       - ios_logging.yml
       - ios_service_fix.yml
+      - l2_interfaces_multiline_trunk.yml
       - l3_sinterface_parser.yml
       - min_215.yaml
       - remove_dep.yml
       - snmp_parse_fix.yml
       - snmp_server_host.yml
       - static_routes_facts_fix.yml
-    release_date: "2024-06-10"
+    release_date: "2024-06-11"
diff --git a/changelogs/fragments/l2_interfaces_multiline_trunk.yml b/changelogs/fragments/l2_interfaces_multiline_trunk.yml