Skip to content

Commit 18cea81

Browse files
rodvandrodvand
authored
Merge pull request #772 from netbox-community/devel
Release 3.7.0
2 parents a5fa839 + 5d6cb68 commit 18cea81

File tree

236 files changed

+18481
-434
lines changed

Some content is hidden

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

236 files changed

+18481
-434
lines changed

‎.github/workflows/main.yml

+23
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ jobs:
5454
- python-version: 3.8
5555
VERSION: "v3.1"
5656
INTEGRATION_TESTS: "v3.1"
57+
- python-version: 3.8
58+
VERSION: "v3.2"
59+
INTEGRATION_TESTS: "v3.2"
5760
steps:
5861
- name: Checkout repo
5962
uses: actions/checkout@v2
@@ -122,6 +125,26 @@ jobs:
122125
docker container ls
123126
cd ..
124127
if: matrix.VERSION == 'v3.1'
128+
- name: Clone & Start netbox-docker containers - 3.2
129+
env:
130+
VERSION: ${{ matrix.VERSION }}
131+
run: |
132+
cd ..
133+
git clone https://github.com/netbox-community/netbox-docker.git
134+
cd netbox-docker
135+
git checkout 1.6.1
136+
tee docker-compose.override.yml <<EOF
137+
version: '3.4'
138+
services:
139+
netbox:
140+
image: netboxcommunity/netbox:v3.2
141+
ports:
142+
- 32768:8080
143+
EOF
144+
docker-compose up -d --quiet-pull
145+
docker container ls
146+
cd ..
147+
if: matrix.VERSION == 'v3.2'
125148
- name: Install and configure Poetry
126149
uses: snok/[email protected]
127150
with:

‎.github/workflows/release.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ jobs:
99
steps:
1010
- name: Checkout repo
1111
uses: actions/checkout@v2
12-
- name: Set up Python 3.8
13-
uses: actions/setup-python@v2
14-
with:
15-
python-version: 3.8
16-
- name: Install ansible-core to deploy collection
17-
run: pip install ansible-core
12+
1813
- name: Build and Deploy Collection
1914
uses: artis3n/ansible_galaxy_collection@v2
2015
with:

‎CHANGELOG.rst

+17
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ NetBox.NetBox Release Notes
55
.. contents:: Topics
66

77

8+
v3.7.0
9+
======
10+
11+
Minor Changes
12+
-------------
13+
14+
- Add meta information for use in Execution Environments [#753](https://github.com/netbox-community/ansible_modules/pull/753)
15+
- Multiple modules - add new parameters added in NetBox 3.2 [#768](https://github.com/netbox-community/ansible_modules/pull/768)
16+
- nb_inventory - Add site_group as an option [#755](https://github.com/netbox-community/ansible_modules/pull/755)
17+
- netbox_front_port and netbox_rear_port - Add label as parameter [#766](https://github.com/netbox-community/ansible_modules/pull/766)
18+
19+
Bugfixes
20+
--------
21+
22+
- netbox_contact_group - Fix field description [#762](https://github.com/netbox-community/ansible_modules/pull/762)
23+
- netbox_rack - Add location as a query parameter for uniqueness check [#751](https://github.com/netbox-community/ansible_modules/pull/751)
24+
825
v3.6.0
926
======
1027

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ To keep the code simple, we only officially support the two latest releases of N
1414
- NetBox 2.11+ or the two latest NetBox releases
1515
- Python 3.8+
1616
- Python modules:
17-
- `pynetbox 5.0.4+`, `pynetbox 6.4.0` if using 3.1 features
18-
- `packages` if using Ansible < 2.10, as it's included in Ansible 2.10+
17+
- `pynetbox 5.0.4+`, `pynetbox 6.4.0+` if using 3.1 features
18+
- `packaging` if using Ansible < 2.10, as it's included in Ansible 2.10+
1919
- Ansible 2.10+
2020
- NetBox write-enabled token when using modules or read-only token for `nb_lookup/nb_inventory`
2121

‎changelogs/changelog.yaml

+13
Original file line numberDiff line numberDiff line change
@@ -676,3 +676,16 @@ releases:
676676
name: netbox_webhook
677677
namespace: ''
678678
release_date: '2022-02-27'
679+
3.7.0:
680+
changes:
681+
minor_changes:
682+
- Multiple modules - add new parameters added in NetBox 3.2 [#768](https://github.com/netbox-community/ansible_modules/pull/768)
683+
- netbox_front_port and netbox_rear_port - Add label as parameter [#766](https://github.com/netbox-community/ansible_modules/pull/766)
684+
- nb_inventory - Add site_group as an option [#755](https://github.com/netbox-community/ansible_modules/pull/755)
685+
- Add meta information for use in Execution Environments [#753](https://github.com/netbox-community/ansible_modules/pull/753)
686+
bugfixes:
687+
- netbox_rack - Add location as a query parameter for uniqueness check [#751](https://github.com/netbox-community/ansible_modules/pull/751)
688+
- netbox_contact_group - Fix field description [#762](https://github.com/netbox-community/ansible_modules/pull/762)
689+
trivial:
690+
- Updated CI to test against NetBox 3.2 [#759](https://github.com/netbox-community/ansible_modules/pull/759)
691+
release_date: '2022-04-18'

‎docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
author = "Mikhail Yohman <@FragmentedPacket>"
2828

2929
# The full version, including alpha/beta/rc tags
30-
release = "3.6.0"
30+
release = "3.7.0"
3131

3232

3333
# -- General configuration ---------------------------------------------------

‎docs/plugins/index.rst

+24-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,30 @@
55
Netbox.Netbox
66
=============
77

8-
Collection version 3.6.0
8+
Collection version 3.7.0
9+
10+
.. contents::
11+
:local:
12+
:depth: 1
13+
14+
Description
15+
-----------
16+
17+
This is a collection of NetBox Ansible modules
18+
19+
**Authors:**
20+
21+
* Mikhail Yohman <[email protected]>
22+
* Martin Rødvand <[email protected]>
23+
24+
.. raw:: html
25+
26+
<p class="ansible-links">
27+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
28+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
29+
</p>
30+
31+
932

1033
.. toctree::
1134
:maxdepth: 1

‎docs/plugins/nb_inventory_inventory.rst

+16-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.nb_inventory inventory -- NetBox inventory source
4242
.. Collection note
4343
4444
.. note::
45-
This inventory plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This inventory plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -1077,6 +1077,7 @@ Parameters
10771077
- :ansible-option-choices-entry:`platforms`
10781078
- :ansible-option-choices-entry:`platform`
10791079
- :ansible-option-choices-entry:`region`
1080+
- :ansible-option-choices-entry:`site\_group`
10801081
- :ansible-option-choices-entry:`cluster`
10811082
- :ansible-option-choices-entry:`cluster\_type`
10821083
- :ansible-option-choices-entry:`cluster\_group`
@@ -2427,6 +2428,20 @@ Authors
24272428
- Douglas Heriot (@DouglasHeriot)
24282429

24292430

2431+
.. hint::
2432+
Configuration entries for each entry type have a low to high priority order. For example, a variable that is lower in the list will override a variable that is higher up.
2433+
2434+
.. Extra links
2435+
2436+
Collection links
2437+
~~~~~~~~~~~~~~~~
2438+
2439+
.. raw:: html
2440+
2441+
<p class="ansible-links">
2442+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
2443+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
2444+
</p>
24302445

24312446
.. Parsing errors
24322447

‎docs/plugins/nb_lookup_lookup.rst

+16-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.nb_lookup lookup -- Queries and returns elements from NetBox
4242
.. Collection note
4343
4444
.. note::
45-
This lookup plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This lookup plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -54,7 +54,7 @@ netbox.netbox.nb_lookup lookup -- Queries and returns elements from NetBox
5454

5555
.. version_added
5656
57-
.. versionadded:: 2.9 of netbox.netbox
57+
.. versionadded:: 0.1.0 of netbox.netbox
5858

5959
.. contents::
6060
:local:
@@ -598,6 +598,20 @@ Authors
598598
- Chris Mills (@cpmills1975)
599599

600600

601+
.. hint::
602+
Configuration entries for each entry type have a low to high priority order. For example, a variable that is lower in the list will override a variable that is higher up.
603+
604+
.. Extra links
605+
606+
Collection links
607+
~~~~~~~~~~~~~~~~
608+
609+
.. raw:: html
610+
611+
<p class="ansible-links">
612+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
613+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
614+
</p>
601615

602616
.. Parsing errors
603617

‎docs/plugins/netbox_aggregate_module.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_aggregate module -- Creates or removes aggregates from NetB
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -735,5 +735,17 @@ Authors
735735

736736

737737

738+
.. Extra links
739+
740+
Collection links
741+
~~~~~~~~~~~~~~~~
742+
743+
.. raw:: html
744+
745+
<p class="ansible-links">
746+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
747+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
748+
</p>
749+
738750
.. Parsing errors
739751

‎docs/plugins/netbox_cable_module.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_cable module -- Create, update or delete cables within NetB
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -1035,5 +1035,17 @@ Authors
10351035

10361036

10371037

1038+
.. Extra links
1039+
1040+
Collection links
1041+
~~~~~~~~~~~~~~~~
1042+
1043+
.. raw:: html
1044+
1045+
<p class="ansible-links">
1046+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
1047+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
1048+
</p>
1049+
10381050
.. Parsing errors
10391051

‎docs/plugins/netbox_circuit_module.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_circuit module -- Create, update or delete circuits within
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -909,5 +909,17 @@ Authors
909909

910910

911911

912+
.. Extra links
913+
914+
Collection links
915+
~~~~~~~~~~~~~~~~
916+
917+
.. raw:: html
918+
919+
<p class="ansible-links">
920+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
921+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
922+
</p>
923+
912924
.. Parsing errors
913925

‎docs/plugins/netbox_circuit_termination_module.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_circuit_termination module -- Create, update or delete circ
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -891,5 +891,17 @@ Authors
891891

892892

893893

894+
.. Extra links
895+
896+
Collection links
897+
~~~~~~~~~~~~~~~~
898+
899+
.. raw:: html
900+
901+
<p class="ansible-links">
902+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
903+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
904+
</p>
905+
894906
.. Parsing errors
895907

‎docs/plugins/netbox_circuit_type_module.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_circuit_type module -- Create, update or delete circuit typ
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -661,5 +661,17 @@ Authors
661661

662662

663663

664+
.. Extra links
665+
666+
Collection links
667+
~~~~~~~~~~~~~~~~
668+
669+
.. raw:: html
670+
671+
<p class="ansible-links">
672+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
673+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
674+
</p>
675+
664676
.. Parsing errors
665677

‎docs/plugins/netbox_cluster_group_module.rst

+13-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ netbox.netbox.netbox_cluster_group module -- Create, update or delete cluster gr
4242
.. Collection note
4343
4444
.. note::
45-
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
45+
This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
4646

4747
You might already have this collection installed if you are using the ``ansible`` package.
4848
It is not included in ``ansible-core``.
@@ -661,5 +661,17 @@ Authors
661661

662662

663663

664+
.. Extra links
665+
666+
Collection links
667+
~~~~~~~~~~~~~~~~
668+
669+
.. raw:: html
670+
671+
<p class="ansible-links">
672+
<a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
673+
<a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
674+
</p>
675+
664676
.. Parsing errors
665677

0 commit comments

Comments
 (0)