Merge branch 'ngine-io:master' into master

arencibiafrancisco · Dec 10, 2024 · c1de58c · c1de58c
2 parents 7abdc7b + ca0a634
commit c1de58c
Show file tree

Hide file tree

Showing 336 changed files with 12,615 additions and 12,266 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -0,0 +1,11 @@
+name: Format in Black
+on: [push, pull_request]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: psf/black@stable
+        with:
+          options: "--check --verbose"
+          src: "."
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -1,32 +1,36 @@
 name: Collection integration
 
 on:
-  push:
-    tags: "v*"
   pull_request:
+    types: [labeled]
+  push:
+    paths:
+      - "plugins/**"
+      - "tests/integration/**"
   schedule:
     - cron: 30 6 * * 2
 
 jobs:
   integration-test:
     name: Integration v${{ matrix.container-version }} Ansible-${{ matrix.ansible-branch }} group${{ matrix.group }} Py${{ matrix.python-version }}
+    if: ${{ github.event.label.name == 'automation' || github.ref_name == 'master' || github.event_name == 'schedule' }}
     defaults:
       run:
         working-directory: ansible_collections/ngine_io/cloudstack
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         python-version:
-          - "3.10"
+          - "3.11"
         group:
           - 1
           - 2
         ansible-branch:
-          - stable-2.14
+          - stable-2.17
         container-version:
-          - 1.4.0
-          - 1.2.0
+          - 1.6.1
+          - 1.7.0
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -57,11 +61,10 @@ jobs:
           -v
           --diff
           --color
-          --retry-on-error
           --python ${{ matrix.python-version }}
           --continue-on-error
           --coverage
-          shippable/cs/group${{ matrix.group }}/
+          cs/group${{ matrix.group }}/
         env:
           ANSIBLE_CLOUDSTACK_CONTAINER: quay.io/ansible/cloudstack-test-container:${{ matrix.container-version }}
 
@@ -73,6 +76,6 @@ jobs:
           --requirements
           --group-by command
           --group-by version
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: false
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
@@ -19,11 +19,11 @@ jobs:
       fail-fast: false
       matrix:
         ansible:
-          - stable-2.12
-          - stable-2.13
-          - stable-2.14
-          - devel
-    runs-on: ubuntu-20.04
+        # - stable-2.15
+        # - stable-2.16
+        - stable-2.17
+        # - devel
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,32 @@ Apache CloudStack Collection Release Notes
 .. contents:: Topics
 
 
+v2.5.0
+======
+
+Minor Changes
+-------------
+
+- cs_instance - Added new arguments ``user_data_name`` and ``user_data_details`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/134).
+- cs_service_offering - Add support for storagetag (https://github.com/ngine-io/ansible-collection-cloudstack/pull/118).
+
+v2.4.1
+======
+
+Bugfixes
+--------
+
+- Fixed a bug related to the new option ``validate_certs`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/135).
+
+v2.4.0
+======
+
+Minor Changes
+-------------
+
+- Added possiblity to disable certs validation using ``validate_certs`` argument (https://github.com/ngine-io/ansible-collection-cloudstack/pull/131).
+- cs_project - Extended to pass ``cleanup=true`` to the deleteProject API when deleting a project (https://github.com/ngine-io/ansible-collection-cloudstack/pull/122).
+
 v2.3.0
 ======
 

diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ To use a module from Apache CloudStack collection, please reference the full nam
 - name: Using Apache CloudStack collection
   hosts: localhost
   tasks:
-    - ngine_io.cloudstack.cs_instance:
+    - ngine_io.cloudstack.instance:
       ...
 ```
 
@@ -48,7 +48,7 @@ Or you can add full namepsace and collecton name in the `collections` element:
   collections:
     - ngine_io.cloudstack
   tasks:
-    - cs_instance:
+    - instance:
       ...
 ```
 
@@ -61,7 +61,7 @@ For existing Ansible roles, please also reference the full namespace, collection
 To use a plugin, please reference the full namespace, collection name, and plugin name that you want to use:
 
 ```yaml
-plugin: ngine_io.cloudstack.cloudstack
+plugin: ngine_io.cloudstack.instance
 ```
 
 ## Contributing

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -126,3 +126,31 @@ releases:
     - cs_instance-pod-cluster-args.yml
     - details_cpu_memory.yml
     release_date: '2022-12-04'
+  2.4.0:
+    changes:
+      minor_changes:
+      - Added possiblity to disable certs validation using ``validate_certs`` argument
+        (https://github.com/ngine-io/ansible-collection-cloudstack/pull/131).
+      - cs_project - Extended to pass ``cleanup=true`` to the deleteProject API when
+        deleting a project (https://github.com/ngine-io/ansible-collection-cloudstack/pull/122).
+    fragments:
+    - cs_project_cleanup_true.yml
+    - validate-certs.yml
+    release_date: '2024-08-23'
+  2.4.1:
+    changes:
+      bugfixes:
+      - Fixed a bug related to the new option ``validate_certs`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/135).
+    fragments:
+    - fix_validate_certs.yml
+    release_date: '2024-09-25'
+  2.5.0:
+    changes:
+      minor_changes:
+      - cs_instance - Added new arguments ``user_data_name`` and ``user_data_details``
+        (https://github.com/ngine-io/ansible-collection-cloudstack/pull/134).
+      - cs_service_offering - Add support for storagetag (https://github.com/ngine-io/ansible-collection-cloudstack/pull/118).
+    fragments:
+    - cs_instance-user_data_name.yml
+    - cs_service_offering-storage-tag.yml
+    release_date: '2024-09-26'
diff --git a/changelogs/fragments/v3.yml b/changelogs/fragments/v3.yml
@@ -0,0 +1,3 @@
+major_changes:
+  - General overhaul (black code style) and renaming of all modules (dropping ``cs_`` prefix) (https://github.com/ngine-io/ansible-collection-cloudstack/pull/141).
+  - Ensuring backwards compatibility and integration tests with CloudStack 4.17 and 4.18.
diff --git a/galaxy.yml b/galaxy.yml
@@ -14,7 +14,8 @@ description: "Ansible Collection for Apache CloudStack based clouds"
 documentation: ""
 homepage: "https://github.com/ngine-io/ansible-collection-cloudstack"
 issues: "https://github.com/ngine-io/ansible-collection-cloudstack/issues"
-license: GPL-3.0-or-later
+license:
+  - GPL-3.0-or-later
 name: cloudstack
 namespace: ngine_io
 readme: README.md
@@ -23,4 +24,4 @@ tags:
   - cloud
   - cloudstack
   - ngine_io
-version: 2.3.0
+version: 3.0.0