Prepare release vyos 2.6.0 (#216)HEAD2.6.0main

Prepare release vyos 2.6.0

Signed-off-by: GomathiselviS gomathiselvi@gmail.com
SUMMARY


ISSUE TYPE


Bugfix Pull Request
Docs Pull Request
Feature Pull Request
New Module Pull Request

COMPONENT NAME

ADDITIONAL INFORMATION

Reviewed-by: None <None>

15 files changed, 84 insertions, 24 deletions

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 8a3703b..18e1a68 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,21 @@ Vyos Collection Release Notes
 .. contents:: Topics
 
 
+v2.6.0
+======
+
+Minor Changes
+-------------
+
+- Add vyos_ntp Resource Module
+- Adds support for specifying an `afi` for an `address_group` for `vyos.vyos.firewall_global`.  As a result, `address_group` now supports IPv6.
+- Adds support for specifying an `afi` for an `network_group` for `vyos.vyos.firewall_global`.  As a result, `network_group` now supports IPv6.
+
+Bugfixes
+--------
+
+- Fix vyos_firewall_rules with state replaced to only replace the specified rules.
+
 v2.5.1
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 9cf06d5..4e76489 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -298,3 +298,21 @@ releases:
     - fix_pylint_issues.yaml
     - tests_become.yaml
     release_date: '2021-08-27'
+  2.6.0:
+    changes:
+      bugfixes:
+      - Fix vyos_firewall_rules with state replaced to only replace the specified
+        rules.
+      minor_changes:
+      - Add vyos_ntp Resource Module
+      - Adds support for specifying an `afi` for an `address_group` for `vyos.vyos.firewall_global`.  As
+        a result, `address_group` now supports IPv6.
+      - Adds support for specifying an `afi` for an `network_group` for `vyos.vyos.firewall_global`.  As
+        a result, `network_group` now supports IPv6.
+    fragments:
+    - 0-copy_ignore_txt.yml
+    - fix-firewall_rules-state-replaced.yaml
+    - set_allow_duplicates.yaml
+    - support_ipv6_address_and_network_groups.yaml
+    - vyos_ntp.yml
+    release_date: '2021-10-02'
diff --git a/changelogs/fragments/0-copy_ignore_txt.yml b/changelogs/fragments/0-copy_ignore_txt.yml
deleted file mode 100644
index ec804d2..0000000
--- a/changelogs/fragments/0-copy_ignore_txt.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-trivial:
-  - Copy ignore.txt.
diff --git a/changelogs/fragments/fix-firewall_rules-state-replaced.yaml b/changelogs/fragments/fix-firewall_rules-state-replaced.yaml
deleted file mode 100644
index 231cd71..0000000
--- a/changelogs/fragments/fix-firewall_rules-state-replaced.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-bugfixes:
-  - Fix vyos_firewall_rules with state replaced to only replace the specified rules.
diff --git a/changelogs/fragments/set_allow_duplicates.yaml b/changelogs/fragments/set_allow_duplicates.yaml
deleted file mode 100644
index 85831a4..0000000
--- a/changelogs/fragments/set_allow_duplicates.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-trivial:
-  - set allow_duplicates to true in prepare_vyos_tests to support network-ee.
diff --git a/changelogs/fragments/support_ipv6_address_and_network_groups.yaml b/changelogs/fragments/support_ipv6_address_and_network_groups.yaml
deleted file mode 100644
index 9243490..0000000
--- a/changelogs/fragments/support_ipv6_address_and_network_groups.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-minor_changes:
-  - Adds support for specifying an `afi` for an `address_group` for `vyos.vyos.firewall_global`.  As a result, `address_group` now supports IPv6.
-  - Adds support for specifying an `afi` for an `network_group` for `vyos.vyos.firewall_global`.  As a result, `network_group` now supports IPv6.
diff --git a/changelogs/fragments/vyos_ntp.yml b/changelogs/fragments/vyos_ntp.yml
deleted file mode 100644
index 7682906..0000000
--- a/changelogs/fragments/vyos_ntp.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-minor_changes:
-  - Add vyos_ntp Resource Module
diff --git a/docs/vyos.vyos.vyos_firewall_global_module.rst b/docs/vyos.vyos.vyos_firewall_global_module.rst
index ec84f55..0a9b615 100644
--- a/docs/vyos.vyos.vyos_firewall_global_module.rst
+++ b/docs/vyos.vyos.vyos_firewall_global_module.rst
@@ -108,6 +108,28 @@ Parameters
                     <td class="elbow-placeholder"></td>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>afi</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li><div style="color: blue"><b>ipv4</b>&nbsp;&larr;</div></li>
+                                    <li>ipv6</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>Specifies IP address type</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                    <td class="elbow-placeholder"></td>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>description</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
@@ -205,6 +227,28 @@ Parameters
                     <td class="elbow-placeholder"></td>
                 <td colspan="2">
                     <div class="ansibleOptionAnchor" id="parameter-"></div>
+                    <b>afi</b>
+                    <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
+                    <div style="font-size: small">
+                        <span style="color: purple">string</span>
+                    </div>
+                </td>
+                <td>
+                        <ul style="margin: 0; padding: 0"><b>Choices:</b>
+                                    <li><div style="color: blue"><b>ipv4</b>&nbsp;&larr;</div></li>
+                                    <li>ipv6</li>
+                        </ul>
+                </td>
+                <td>
+                        <div>Specifies network address type</div>
+                </td>
+            </tr>
+            <tr>
+                    <td class="elbow-placeholder"></td>
+                    <td class="elbow-placeholder"></td>
+                    <td class="elbow-placeholder"></td>
+                <td colspan="2">
+                    <div class="ansibleOptionAnchor" id="parameter-"></div>
                     <b>description</b>
                     <a class="ansibleOptionLink" href="#parameter-" title="Permalink to this option"></a>
                     <div style="font-size: small">
diff --git a/docs/vyos.vyos.vyos_interface_module.rst b/docs/vyos.vyos.vyos_interface_module.rst
index 1fc2232..46af72d 100644
--- a/docs/vyos.vyos.vyos_interface_module.rst
+++ b/docs/vyos.vyos.vyos_interface_module.rst
@@ -674,7 +674,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2022-06-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.
 
 
diff --git a/docs/vyos.vyos.vyos_l3_interface_module.rst b/docs/vyos.vyos.vyos_l3_interface_module.rst
index f185550..2e73e7b 100644
--- a/docs/vyos.vyos.vyos_l3_interface_module.rst
+++ b/docs/vyos.vyos.vyos_l3_interface_module.rst
@@ -386,7 +386,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2022-06-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.
 
 
diff --git a/docs/vyos.vyos.vyos_linkagg_module.rst b/docs/vyos.vyos.vyos_linkagg_module.rst
index 836ddcf..f7586d6 100644
--- a/docs/vyos.vyos.vyos_linkagg_module.rst
+++ b/docs/vyos.vyos.vyos_linkagg_module.rst
@@ -414,7 +414,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2022-06-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.
 
 
diff --git a/docs/vyos.vyos.vyos_lldp_interface_module.rst b/docs/vyos.vyos.vyos_lldp_interface_module.rst
index 380b4e8..0103664 100644
--- a/docs/vyos.vyos.vyos_lldp_interface_module.rst
+++ b/docs/vyos.vyos.vyos_lldp_interface_module.rst
@@ -334,7 +334,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2022-06-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.
 
 
diff --git a/docs/vyos.vyos.vyos_lldp_module.rst b/docs/vyos.vyos.vyos_lldp_module.rst
index 9a5048a..88d0211 100644
--- a/docs/vyos.vyos.vyos_lldp_module.rst
+++ b/docs/vyos.vyos.vyos_lldp_module.rst
@@ -258,7 +258,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2022-06-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.
 
 
diff --git a/docs/vyos.vyos.vyos_logging_module.rst b/docs/vyos.vyos.vyos_logging_module.rst
index 48183df..39f885e 100644
--- a/docs/vyos.vyos.vyos_logging_module.rst
+++ b/docs/vyos.vyos.vyos_logging_module.rst
@@ -441,7 +441,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2023-08-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.
 
 
diff --git a/docs/vyos.vyos.vyos_static_route_module.rst b/docs/vyos.vyos.vyos_static_route_module.rst
index 67ae6be..69afb56 100644
--- a/docs/vyos.vyos.vyos_static_route_module.rst
+++ b/docs/vyos.vyos.vyos_static_route_module.rst
@@ -427,7 +427,7 @@ Status
 ------
 
 
-- This module will be removed in a release after 2022-06-01. *[deprecated]*
+- This module will be removed in version . *[deprecated]*
 - For more information see `DEPRECATED`_.