Sync bitbucket and GitHub

ansible-collections · Oct 5, 2022 · c8da472 · c8da472
1 parent 8b6e7f1
commit c8da472
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 19 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,22 @@ NetApp CloudManager Collection Release Notes
 .. contents:: Topics
 
 
+v21.20.0
+========
+
+Minor Changes
+-------------
+
+- Add ``availability_zone`` option in CVO Azure on the location configuration.
+- Add ``subnet_path`` option in CVO GCP.
+- na_cloudmanager_cvo_aws - Add new parameter ``cluster_key_pair_name`` to support SSH authentication method key pair.
+- na_cloudmanager_volume - Support AWS FsxN working environment.
+
+Bugfixes
+--------
+
+- na_cloudmanager_connector_gcp - Fix default machine_type value on the GCP connector.
+
 v21.19.0
 ========
 

diff --git a/README.md b/README.md
@@ -36,26 +36,17 @@ This collection follows the [Ansible project's Code of Conduct](https://docs.ans
 https://github.com/ansible-collections/netapp/wiki
 
 # Release Notes
-## 21.22.0
-
-### New Options
-- Add `availability_zone` option in CVO Azure on the location configuration.
-
-## 21.21.1
-
-### Bug Fixes
-  - Fix the `machine_type` default value in the connector GCP.
-
-## 21.21.0
-
-### New Options
-  - Add `cluster_key_pair_name` option in CVO AWS for SSH authentication key pair method.
 
 ## 21.20.0
 
 ### New Options
+  - Add `availability_zone` option in CVO Azure on the location configuration.
+  - Add `cluster_key_pair_name` option in CVO AWS for SSH authentication key pair method.
   - Add `subnet_path` option in CVO GCP.
 
+### Bug Fixes
+  - Fix the `machine_type` default value in the connector GCP.
+
 ### Minor Changes
   - na_cloudmanager_volume - Support AWS FsxN working environment
 

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -182,6 +182,24 @@ releases:
     fragments:
     - DEVOPS-5252.yaml
     release_date: '2022-08-03'
+  21.20.0:
+    changes:
+      bugfixes:
+      - na_cloudmanager_connector_gcp - Fix default machine_type value on the GCP
+        connector.
+      minor_changes:
+      - Add ``availability_zone`` option in CVO Azure on the location configuration.
+      - Add ``subnet_path`` option in CVO GCP.
+      - na_cloudmanager_cvo_aws - Add new parameter ``cluster_key_pair_name`` to support
+        SSH authentication method key pair.
+      - na_cloudmanager_volume - Support AWS FsxN working environment.
+    fragments:
+    - DEVOPS-5307.yaml
+    - DEVOPS-5342.yaml
+    - DEVOPS-5366.yaml
+    - DEVOPS-5437.yaml
+    - DEVOPS-5472.yaml
+    release_date: '2022-10-05'
   21.3.0:
     modules:
     - description: NetApp Cloud Manager Aggregate

diff --git a/changelogs/fragments/DEVOPS-5472.yaml b/changelogs/fragments/DEVOPS-5472.yaml
@@ -0,0 +1,2 @@
+minor_changes:
+  - Add ``availability_zone`` option in CVO Azure on the location configuration.
diff --git a/galaxy.yml b/galaxy.yml
@@ -9,7 +9,7 @@ namespace: netapp
 name: cloudmanager
 
 # The version of the collection. Must be compatible with semantic versioning
-version: "21.22.0"
+version: "21.20.0"
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md

diff --git a/plugins/module_utils/netapp.py b/plugins/module_utils/netapp.py
@@ -42,7 +42,7 @@
 except ImportError:
     ansible_version = 'unknown'
 
-COLLECTION_VERSION = "21.22.0"
+COLLECTION_VERSION = "21.20.0"
 PROD_ENVIRONMENT = {
     'CLOUD_MANAGER_HOST': 'cloudmanager.cloud.netapp.com',
     'AUTH0_DOMAIN': 'netapp-cloud-account.auth0.com',

diff --git a/plugins/modules/na_cloudmanager_cvo_aws.py b/plugins/modules/na_cloudmanager_cvo_aws.py
@@ -182,7 +182,7 @@
     description:
       - SSH authentication key pair name
     type: str
-    version_added: 21.21.0
+    version_added: 21.20.0
 
   nss_account:
     description:

diff --git a/plugins/modules/na_cloudmanager_cvo_azure.py b/plugins/modules/na_cloudmanager_cvo_azure.py
@@ -309,7 +309,7 @@
     description:
     - The availability zone on the location configuration.
     type: int
-    version_added: 21.22.0
+    version_added: 21.20.0
 '''
 
 EXAMPLES = """

diff --git a/plugins/modules/na_cloudmanager_volume.py b/plugins/modules/na_cloudmanager_volume.py
@@ -186,7 +186,7 @@
         description:
         - The NetApp account ID that the Connector will be associated with. To be used only when using FSx.
         type: str
-        version_added: 21.22.0
+        version_added: 21.20.0
 
     initiators:
         description: