Skip to content

Commit e8c126e

Browse files
Merge branch 'master' into master
2 parents c1de58c + 925b18f commit e8c126e

File tree

9 files changed

+50
-13
lines changed

9 files changed

+50
-13
lines changed

.github/workflows/format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
lint:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v4
7+
- uses: actions/checkout@v5
88
- uses: psf/black@stable
99
with:
1010
options: "--check --verbose"

.github/workflows/integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333
- 1.7.0
3434
steps:
3535
- name: Check out code
36-
uses: actions/checkout@v4
36+
uses: actions/checkout@v5
3737
with:
3838
path: ansible_collections/ngine_io/cloudstack
3939

4040
- name: Set up Python ${{ matrix.python-version }}
41-
uses: actions/setup-python@v5
41+
uses: actions/setup-python@v6
4242
with:
4343
python-version: ${{ matrix.python-version }}
4444

.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
run:
1212
working-directory: ansible_collections/ngine_io/cloudstack
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v5
1515
with:
1616
path: ansible_collections/ngine_io/cloudstack
1717
- name: Set up Python
18-
uses: actions/setup-python@v5
18+
uses: actions/setup-python@v6
1919
with:
2020
python-version: "3.x"
2121
- name: Install dependencies

.github/workflows/sanity.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ jobs:
2626
runs-on: ubuntu-22.04
2727
steps:
2828
- name: Check out code
29-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
3030
with:
3131
path: ansible_collections/ngine_io/cloudstack
3232

3333
- name: Set up Python
34-
uses: actions/setup-python@v5
34+
uses: actions/setup-python@v6
3535
with:
3636
python-version: "3.11"
3737

CHANGELOG.rst

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,25 @@ Apache CloudStack Collection Release Notes
44

55
.. contents:: Topics
66

7+
v3.0.0
8+
======
9+
10+
Major Changes
11+
-------------
12+
13+
- Ensuring backwards compatibility and integration tests with CloudStack 4.17 and 4.18.
14+
- General overhaul (black code style) and renaming of all modules (dropping ``cs_`` prefix) (https://github.com/ngine-io/ansible-collection-cloudstack/pull/141).
15+
- Update cs dependency to ``>=3.4.0``.
16+
17+
Bugfixes
18+
--------
19+
20+
- Ensure tags are applied when creating or updating a template (https://github.com/ngine-io/ansible-collection-cloudstack/pull/154).
21+
22+
New Modules
23+
-----------
24+
25+
- configuration_info - Gathering information about configurations from Apache CloudStack based clouds.
726

827
v2.5.0
928
======

changelogs/changelog.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,3 +154,22 @@ releases:
154154
- cs_instance-user_data_name.yml
155155
- cs_service_offering-storage-tag.yml
156156
release_date: '2024-09-26'
157+
3.0.0:
158+
changes:
159+
bugfixes:
160+
- Ensure tags are applied when creating or updating a template (https://github.com/ngine-io/ansible-collection-cloudstack/pull/154).
161+
major_changes:
162+
- Ensuring backwards compatibility and integration tests with CloudStack 4.17
163+
and 4.18.
164+
- General overhaul (black code style) and renaming of all modules (dropping
165+
``cs_`` prefix) (https://github.com/ngine-io/ansible-collection-cloudstack/pull/141).
166+
- Update cs dependency to >=3.4.0.
167+
fragments:
168+
- 124-template-ensure-tags.yml
169+
- v3.yml
170+
modules:
171+
- description: Gathering information about configurations from Apache CloudStack
172+
based clouds.
173+
name: configuration_info
174+
namespace: ''
175+
release_date: '2025-10-22'

changelogs/fragments/v3.yml

Lines changed: 0 additions & 3 deletions
This file was deleted.

plugins/modules/template.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,10 @@ def present_template(self):
458458
template = self.create_template()
459459
else:
460460
self.fail_json(msg="one of the following is required on state=present: url, vm")
461+
462+
if template:
463+
template = self.ensure_tags(resource=template, resource_type="Template")
464+
461465
return template
462466

463467
def create_template(self):

requirements.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
cs>=0.9.0
2-
requests>=2.32.2 # not directly required, pinned by Snyk to avoid a vulnerability
3-
urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability
1+
cs>=3.4.0

0 commit comments

Comments
 (0)