Skip to content

Commit c1de58c

Browse files
Merge branch 'ngine-io:master' into master
2 parents 7abdc7b + ca0a634 commit c1de58c

File tree

336 files changed

+12615
-12266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

336 files changed

+12615
-12266
lines changed

.github/workflows/format.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: Format in Black
2+
on: [push, pull_request]
3+
jobs:
4+
lint:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v4
8+
- uses: psf/black@stable
9+
with:
10+
options: "--check --verbose"
11+
src: "."

.github/workflows/integration.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
11
name: Collection integration
22

33
on:
4-
push:
5-
tags: "v*"
64
pull_request:
5+
types: [labeled]
6+
push:
7+
paths:
8+
- "plugins/**"
9+
- "tests/integration/**"
710
schedule:
811
- cron: 30 6 * * 2
912

1013
jobs:
1114
integration-test:
1215
name: Integration v${{ matrix.container-version }} Ansible-${{ matrix.ansible-branch }} group${{ matrix.group }} Py${{ matrix.python-version }}
16+
if: ${{ github.event.label.name == 'automation' || github.ref_name == 'master' || github.event_name == 'schedule' }}
1317
defaults:
1418
run:
1519
working-directory: ansible_collections/ngine_io/cloudstack
16-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-latest
1721
strategy:
1822
fail-fast: false
1923
matrix:
2024
python-version:
21-
- "3.10"
25+
- "3.11"
2226
group:
2327
- 1
2428
- 2
2529
ansible-branch:
26-
- stable-2.14
30+
- stable-2.17
2731
container-version:
28-
- 1.4.0
29-
- 1.2.0
32+
- 1.6.1
33+
- 1.7.0
3034
steps:
3135
- name: Check out code
3236
uses: actions/checkout@v4
@@ -57,11 +61,10 @@ jobs:
5761
-v
5862
--diff
5963
--color
60-
--retry-on-error
6164
--python ${{ matrix.python-version }}
6265
--continue-on-error
6366
--coverage
64-
shippable/cs/group${{ matrix.group }}/
67+
cs/group${{ matrix.group }}/
6568
env:
6669
ANSIBLE_CLOUDSTACK_CONTAINER: quay.io/ansible/cloudstack-test-container:${{ matrix.container-version }}
6770

@@ -73,6 +76,6 @@ jobs:
7376
--requirements
7477
--group-by command
7578
--group-by version
76-
- uses: codecov/codecov-action@v4
79+
- uses: codecov/codecov-action@v5
7780
with:
7881
fail_ci_if_error: false

.github/workflows/sanity.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
ansible:
22-
- stable-2.12
23-
- stable-2.13
24-
- stable-2.14
25-
- devel
26-
runs-on: ubuntu-20.04
22+
# - stable-2.15
23+
# - stable-2.16
24+
- stable-2.17
25+
# - devel
26+
runs-on: ubuntu-22.04
2727
steps:
2828
- name: Check out code
2929
uses: actions/checkout@v4
@@ -33,7 +33,7 @@ jobs:
3333
- name: Set up Python
3434
uses: actions/setup-python@v5
3535
with:
36-
python-version: "3.10"
36+
python-version: "3.11"
3737

3838
- name: Install ansible-base (${{ matrix.ansible }})
3939
run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check

CHANGELOG.rst

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,32 @@ Apache CloudStack Collection Release Notes
55
.. contents:: Topics
66

77

8+
v2.5.0
9+
======
10+
11+
Minor Changes
12+
-------------
13+
14+
- cs_instance - Added new arguments ``user_data_name`` and ``user_data_details`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/134).
15+
- cs_service_offering - Add support for storagetag (https://github.com/ngine-io/ansible-collection-cloudstack/pull/118).
16+
17+
v2.4.1
18+
======
19+
20+
Bugfixes
21+
--------
22+
23+
- Fixed a bug related to the new option ``validate_certs`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/135).
24+
25+
v2.4.0
26+
======
27+
28+
Minor Changes
29+
-------------
30+
31+
- Added possiblity to disable certs validation using ``validate_certs`` argument (https://github.com/ngine-io/ansible-collection-cloudstack/pull/131).
32+
- 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).
33+
834
v2.3.0
935
======
1036

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ To use a module from Apache CloudStack collection, please reference the full nam
3535
- name: Using Apache CloudStack collection
3636
hosts: localhost
3737
tasks:
38-
- ngine_io.cloudstack.cs_instance:
38+
- ngine_io.cloudstack.instance:
3939
...
4040
```
4141
@@ -48,7 +48,7 @@ Or you can add full namepsace and collecton name in the `collections` element:
4848
collections:
4949
- ngine_io.cloudstack
5050
tasks:
51-
- cs_instance:
51+
- instance:
5252
...
5353
```
5454

@@ -61,7 +61,7 @@ For existing Ansible roles, please also reference the full namespace, collection
6161
To use a plugin, please reference the full namespace, collection name, and plugin name that you want to use:
6262

6363
```yaml
64-
plugin: ngine_io.cloudstack.cloudstack
64+
plugin: ngine_io.cloudstack.instance
6565
```
6666

6767
## Contributing

changelogs/changelog.yaml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,31 @@ releases:
126126
- cs_instance-pod-cluster-args.yml
127127
- details_cpu_memory.yml
128128
release_date: '2022-12-04'
129+
2.4.0:
130+
changes:
131+
minor_changes:
132+
- Added possiblity to disable certs validation using ``validate_certs`` argument
133+
(https://github.com/ngine-io/ansible-collection-cloudstack/pull/131).
134+
- cs_project - Extended to pass ``cleanup=true`` to the deleteProject API when
135+
deleting a project (https://github.com/ngine-io/ansible-collection-cloudstack/pull/122).
136+
fragments:
137+
- cs_project_cleanup_true.yml
138+
- validate-certs.yml
139+
release_date: '2024-08-23'
140+
2.4.1:
141+
changes:
142+
bugfixes:
143+
- Fixed a bug related to the new option ``validate_certs`` (https://github.com/ngine-io/ansible-collection-cloudstack/pull/135).
144+
fragments:
145+
- fix_validate_certs.yml
146+
release_date: '2024-09-25'
147+
2.5.0:
148+
changes:
149+
minor_changes:
150+
- cs_instance - Added new arguments ``user_data_name`` and ``user_data_details``
151+
(https://github.com/ngine-io/ansible-collection-cloudstack/pull/134).
152+
- cs_service_offering - Add support for storagetag (https://github.com/ngine-io/ansible-collection-cloudstack/pull/118).
153+
fragments:
154+
- cs_instance-user_data_name.yml
155+
- cs_service_offering-storage-tag.yml
156+
release_date: '2024-09-26'

changelogs/fragments/v3.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
major_changes:
2+
- General overhaul (black code style) and renaming of all modules (dropping ``cs_`` prefix) (https://github.com/ngine-io/ansible-collection-cloudstack/pull/141).
3+
- Ensuring backwards compatibility and integration tests with CloudStack 4.17 and 4.18.

galaxy.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ description: "Ansible Collection for Apache CloudStack based clouds"
1414
documentation: ""
1515
homepage: "https://github.com/ngine-io/ansible-collection-cloudstack"
1616
issues: "https://github.com/ngine-io/ansible-collection-cloudstack/issues"
17-
license: GPL-3.0-or-later
17+
license:
18+
- GPL-3.0-or-later
1819
name: cloudstack
1920
namespace: ngine_io
2021
readme: README.md
@@ -23,4 +24,4 @@ tags:
2324
- cloud
2425
- cloudstack
2526
- ngine_io
26-
version: 2.3.0
27+
version: 3.0.0

0 commit comments

Comments
 (0)