Skip to content

Commit 638fa22

Browse files
authored
Merge pull request #910 from netbox-community/devel
Release 3.10.0
2 parents ba44b5b + a46c606 commit 638fa22

File tree

251 files changed

+24388
-1654
lines changed

Some content is hidden

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

251 files changed

+24388
-1654
lines changed

.github/ISSUE_TEMPLATE/bug_report.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ body:
2525
attributes:
2626
label: Ansible NetBox Collection version
2727
description: What version of the Ansible NetBox Collection are you currently running?
28-
placeholder: v3.5.1
28+
placeholder: v3.10.0
2929
validations:
3030
required: true
3131
- type: textarea
@@ -46,7 +46,7 @@ body:
4646
attributes:
4747
label: NetBox version
4848
description: What version of NetBox are you currently running?
49-
placeholder: v3.1.6
49+
placeholder: v3.4.0
5050
validations:
5151
required: true
5252
- type: dropdown
@@ -57,6 +57,7 @@ body:
5757
- "3.8"
5858
- "3.9"
5959
- "3.10"
60+
- "3.11"
6061
validations:
6162
required: true
6263
- type: textarea

.github/ISSUE_TEMPLATE/feature_request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ body:
1515
attributes:
1616
label: NetBox version
1717
description: What version of NetBox are you currently running?
18-
placeholder: v3.1.6
18+
placeholder: v3.4.0
1919
validations:
2020
required: true
2121
- type: dropdown

.github/workflows/main.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,83 +44,83 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
include:
48-
- python-version: 3.8
49-
VERSION: "v3.1"
50-
INTEGRATION_TESTS: "v3.1"
47+
include:
5148
- python-version: 3.8
5249
VERSION: "v3.2"
5350
INTEGRATION_TESTS: "v3.2"
5451
- python-version: 3.8
5552
VERSION: "v3.3"
5653
INTEGRATION_TESTS: "v3.3"
54+
- python-version: 3.8
55+
VERSION: "v3.4"
56+
INTEGRATION_TESTS: "v3.4"
5757
steps:
5858
- name: Checkout repo
5959
uses: actions/checkout@v2
6060
- name: Set up Python ${{ matrix.python-version }}
6161
uses: actions/setup-python@v2
6262
with:
63-
python-version: ${{ matrix.python-version }}
64-
- name: Clone & Start netbox-docker containers - 3.1
63+
python-version: ${{ matrix.python-version }}
64+
- name: Clone & Start netbox-docker containers - 3.2
6565
env:
6666
VERSION: ${{ matrix.VERSION }}
6767
run: |
6868
cd ..
6969
git clone https://github.com/netbox-community/netbox-docker.git
7070
cd netbox-docker
71-
git checkout 1.4.1
71+
git checkout 1.6.1
7272
tee docker-compose.override.yml <<EOF
7373
version: '3.4'
7474
services:
7575
netbox:
76-
image: netboxcommunity/netbox:v3.1
76+
image: netboxcommunity/netbox:v3.2
7777
ports:
7878
- 32768:8080
7979
EOF
8080
docker-compose up -d --quiet-pull
8181
docker container ls
8282
cd ..
83-
if: matrix.VERSION == 'v3.1'
84-
- name: Clone & Start netbox-docker containers - 3.2
83+
if: matrix.VERSION == 'v3.2'
84+
- name: Clone & Start netbox-docker containers - 3.3
8585
env:
8686
VERSION: ${{ matrix.VERSION }}
8787
run: |
8888
cd ..
8989
git clone https://github.com/netbox-community/netbox-docker.git
9090
cd netbox-docker
91-
git checkout 1.6.1
91+
git checkout 2.2.0
9292
tee docker-compose.override.yml <<EOF
9393
version: '3.4'
9494
services:
9595
netbox:
96-
image: netboxcommunity/netbox:v3.2
96+
image: netboxcommunity/netbox:v3.3
9797
ports:
9898
- 32768:8080
9999
EOF
100100
docker-compose up -d --quiet-pull
101101
docker container ls
102102
cd ..
103-
if: matrix.VERSION == 'v3.2'
104-
- name: Clone & Start netbox-docker containers - 3.3
103+
if: matrix.VERSION == 'v3.3'
104+
- name: Clone & Start netbox-docker containers - 3.4
105105
env:
106106
VERSION: ${{ matrix.VERSION }}
107107
run: |
108108
cd ..
109109
git clone https://github.com/netbox-community/netbox-docker.git
110110
cd netbox-docker
111-
git checkout 2.2.0
111+
git checkout 2.3.0
112112
tee docker-compose.override.yml <<EOF
113113
version: '3.4'
114114
services:
115115
netbox:
116-
image: netboxcommunity/netbox:v3.3
116+
image: netboxcommunity/netbox:v3.4
117117
ports:
118118
- 32768:8080
119119
EOF
120120
docker-compose up -d --quiet-pull
121121
docker container ls
122122
cd ..
123-
if: matrix.VERSION == 'v3.3'
123+
if: matrix.VERSION == 'v3.4'
124124
- name: Install and configure Poetry
125125
uses: snok/install-poetry@v1.1.1
126126
with:

CHANGELOG.rst

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,31 @@ NetBox.NetBox Release Notes
55
.. contents:: Topics
66

77

8+
v3.10.0
9+
=======
10+
11+
Minor Changes
12+
-------------
13+
14+
- Add options for NetBox 3.4 [#905](https://github.com/netbox-community/ansible_modules/pull/905)
15+
- netbox_custom_field - Add group_name [#882](https://github.com/netbox-community/ansible_modules/pull/882)
16+
- netbox_device_type and netbox_device - Add airflow [#907](https://github.com/netbox-community/ansible_modules/pull/907)
17+
- netbox_invventory_item_role - Add module [#885](https://github.com/netbox-community/ansible_modules/pull/885)
18+
- netbox_module_type - Add module [#887](https://github.com/netbox-community/ansible_modules/pull/887)
19+
- netbox_service_template - Add module [#908](https://github.com/netbox-community/ansible_modules/pull/908)
20+
21+
Bugfixes
22+
--------
23+
24+
- nb_inventory - Raise exception on missing packaging [#900](https://github.com/netbox-community/ansible_modules/pull/900)
25+
26+
New Modules
27+
-----------
28+
29+
- netbox.netbox.netbox_inventory_item_role - Create, update or delete inventory item roles in NetBox
30+
- netbox.netbox.netbox_module_type - Create, update or delete module types in NetBox
31+
- netbox.netbox.netbox_service_template - Create, update or delete service templates in NetBox
32+
833
v3.9.0
934
======
1035

changelogs/changelog.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,3 +732,28 @@ releases:
732732
name: netbox_l2vpn
733733
namespace: ''
734734
release_date: '2022-11-14'
735+
3.10.0:
736+
changes:
737+
bugfixes:
738+
- nb_inventory - Raise exception on missing packaging [#900](https://github.com/netbox-community/ansible_modules/pull/900)
739+
minor_changes:
740+
- netbox_service_template - Add module [#908](https://github.com/netbox-community/ansible_modules/pull/908)
741+
- netbox_module_type - Add module [#887](https://github.com/netbox-community/ansible_modules/pull/887)
742+
- netbox_invventory_item_role - Add module [#885](https://github.com/netbox-community/ansible_modules/pull/885)
743+
- Add options for NetBox 3.4 [#905](https://github.com/netbox-community/ansible_modules/pull/905)
744+
- netbox_custom_field - Add group_name [#882](https://github.com/netbox-community/ansible_modules/pull/882)
745+
- netbox_device_type and netbox_device - Add airflow [#907](https://github.com/netbox-community/ansible_modules/pull/907)
746+
trivial:
747+
- Update CI for NetBox 3.4 [#906](https://github.com/netbox-community/ansible_modules/pull/906)
748+
- Update documentation to use FQCN [#881](https://github.com/netbox-community/ansible_modules/pull/881)
749+
modules:
750+
- description: Create, update or delete service templates in NetBox
751+
name: netbox_service_template
752+
namespace: ''
753+
- description: Create, update or delete module types in NetBox
754+
name: netbox_module_type
755+
namespace: ''
756+
- description: Create, update or delete inventory item roles in NetBox
757+
name: netbox_inventory_item_role
758+
namespace: ''
759+
release_date: '2022-12-16'

docs/conf.py

Lines changed: 1 addition & 1 deletion
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.9.0"
30+
release = "3.10.0"
3131

3232

3333
# -- General configuration ---------------------------------------------------
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
2+
:orphan:
3+
4+
.. _list_of_collection_env_vars:
5+
6+
Index of all Collection Environment Variables
7+
=============================================
8+
9+
The following index documents all environment variables declared by plugins in collections.
10+
Environment variables used by the ansible-core configuation are documented in :ref:`ansible_configuration_settings`.
11+
12+
.. envvar:: ANSIBLE_INVENTORY_USE_EXTRA_VARS
13+
14+
Merge extra vars into the available variables for composition (highest precedence).
15+
16+
*Used by:*
17+
:ref:`netbox.netbox.nb\_inventory inventory plugin <ansible_collections.netbox.netbox.nb_inventory_inventory>`
18+
.. envvar:: NETBOX_API
19+
20+
See the documentations for the options where this environment variable is used.
21+
22+
*Used by:*
23+
:ref:`netbox.netbox.nb\_inventory inventory plugin <ansible_collections.netbox.netbox.nb_inventory_inventory>`,
24+
:ref:`netbox.netbox.nb\_lookup lookup plugin <ansible_collections.netbox.netbox.nb_lookup_lookup>`
25+
.. envvar:: NETBOX_API_KEY
26+
27+
NetBox API token to be able to read against NetBox.
28+
29+
This may not be required depending on the NetBox setup.
30+
31+
*Used by:*
32+
:ref:`netbox.netbox.nb\_inventory inventory plugin <ansible_collections.netbox.netbox.nb_inventory_inventory>`
33+
.. envvar:: NETBOX_API_TOKEN
34+
35+
The API token created through NetBox
36+
37+
This may not be required depending on the NetBox setup.
38+
39+
*Used by:*
40+
:ref:`netbox.netbox.nb\_lookup lookup plugin <ansible_collections.netbox.netbox.nb_lookup_lookup>`
41+
.. envvar:: NETBOX_TOKEN
42+
43+
See the documentations for the options where this environment variable is used.
44+
45+
*Used by:*
46+
:ref:`netbox.netbox.nb\_inventory inventory plugin <ansible_collections.netbox.netbox.nb_inventory_inventory>`,
47+
:ref:`netbox.netbox.nb\_lookup lookup plugin <ansible_collections.netbox.netbox.nb_lookup_lookup>`
48+
.. envvar:: NETBOX_URL
49+
50+
The URL to the NetBox instance to query
51+
52+
*Used by:*
53+
:ref:`netbox.netbox.nb\_lookup lookup plugin <ansible_collections.netbox.netbox.nb_lookup_lookup>`

docs/plugins/index.rst

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
Netbox.Netbox
77
=============
88

9-
Collection version 3.9.0
9+
Collection version 3.10.0
1010

1111
.. contents::
1212
:local:
@@ -22,6 +22,10 @@ This is a collection of NetBox Ansible modules
2222
* Mikhail Yohman <mikhail.yohman@gmail.com>
2323
* Martin Rødvand <martin@rodvand.net>
2424

25+
**Supported ansible-core versions:**
26+
27+
* 2.9.10 or newer
28+
2529
.. raw:: html
2630

2731
<p class="ansible-links">
@@ -73,11 +77,13 @@ Modules
7377
* :ref:`netbox_front_port module <ansible_collections.netbox.netbox.netbox_front_port_module>` -- Create, update or delete front ports within NetBox
7478
* :ref:`netbox_front_port_template module <ansible_collections.netbox.netbox.netbox_front_port_template_module>` -- Create, update or delete front port templates within NetBox
7579
* :ref:`netbox_inventory_item module <ansible_collections.netbox.netbox.netbox_inventory_item_module>` -- Creates or removes inventory items from NetBox
80+
* :ref:`netbox_inventory_item_role module <ansible_collections.netbox.netbox.netbox_inventory_item_role_module>` -- Create, update or delete devices roles within NetBox
7681
* :ref:`netbox_ip_address module <ansible_collections.netbox.netbox.netbox_ip_address_module>` -- Creates or removes IP addresses from NetBox
7782
* :ref:`netbox_ipam_role module <ansible_collections.netbox.netbox.netbox_ipam_role_module>` -- Creates or removes ipam roles from NetBox
7883
* :ref:`netbox_l2vpn module <ansible_collections.netbox.netbox.netbox_l2vpn_module>` -- Create, update or delete L2VPNs within NetBox
7984
* :ref:`netbox_location module <ansible_collections.netbox.netbox.netbox_location_module>` -- Create, update or delete locations within NetBox
8085
* :ref:`netbox_manufacturer module <ansible_collections.netbox.netbox.netbox_manufacturer_module>` -- Create or delete manufacturers within NetBox
86+
* :ref:`netbox_module_type module <ansible_collections.netbox.netbox.netbox_module_type_module>` -- Create, update or delete module types within NetBox
8187
* :ref:`netbox_platform module <ansible_collections.netbox.netbox.netbox_platform_module>` -- Create or delete platforms within NetBox
8288
* :ref:`netbox_power_feed module <ansible_collections.netbox.netbox.netbox_power_feed_module>` -- Create, update or delete power feeds within NetBox
8389
* :ref:`netbox_power_outlet module <ansible_collections.netbox.netbox.netbox_power_outlet_module>` -- Create, update or delete power outlets within NetBox
@@ -97,6 +103,7 @@ Modules
97103
* :ref:`netbox_rir module <ansible_collections.netbox.netbox.netbox_rir_module>` -- Create, update or delete RIRs within NetBox
98104
* :ref:`netbox_route_target module <ansible_collections.netbox.netbox.netbox_route_target_module>` -- Creates or removes route targets from NetBox
99105
* :ref:`netbox_service module <ansible_collections.netbox.netbox.netbox_service_module>` -- Creates or removes service from NetBox
106+
* :ref:`netbox_service_template module <ansible_collections.netbox.netbox.netbox_service_template_module>` -- Create, update or delete service templates within NetBox
100107
* :ref:`netbox_site module <ansible_collections.netbox.netbox.netbox_site_module>` -- Creates or removes sites from NetBox
101108
* :ref:`netbox_site_group module <ansible_collections.netbox.netbox.netbox_site_group_module>` -- Create, update, or delete site groups within NetBox
102109
* :ref:`netbox_tag module <ansible_collections.netbox.netbox.netbox_tag_module>` -- Creates or removes tags from NetBox
@@ -127,10 +134,6 @@ Lookup Plugins
127134

128135

129136

130-
.. seealso::
131-
132-
List of :ref:`collections <list_of_collections>` with docs hosted here.
133-
134137
.. toctree::
135138
:maxdepth: 1
136139
:hidden:
@@ -166,11 +169,13 @@ Lookup Plugins
166169
netbox_front_port_module
167170
netbox_front_port_template_module
168171
netbox_inventory_item_module
172+
netbox_inventory_item_role_module
169173
netbox_ip_address_module
170174
netbox_ipam_role_module
171175
netbox_l2vpn_module
172176
netbox_location_module
173177
netbox_manufacturer_module
178+
netbox_module_type_module
174179
netbox_platform_module
175180
netbox_power_feed_module
176181
netbox_power_outlet_module
@@ -190,6 +195,7 @@ Lookup Plugins
190195
netbox_rir_module
191196
netbox_route_target_module
192197
netbox_service_module
198+
netbox_service_template_module
193199
netbox_site_module
194200
netbox_site_group_module
195201
netbox_tag_module

0 commit comments

Comments
 (0)