Skip to content

Commit

Permalink
Merge branch 'develop' into add_ipv6_ansible_host
Browse files Browse the repository at this point in the history
  • Loading branch information
jvanderaa authored Jul 14, 2024
2 parents f601238 + b345813 commit 0f213b9
Show file tree
Hide file tree
Showing 98 changed files with 2,623 additions and 3,532 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ jobs:
python-version:
- "3.9"
nautobot-version:
- "2.1"
# TODO: Change to 2.2 once it's released
# - "2.2"
- "2.2"
ansible-version:
- "2.14"
- "2.15"
Expand All @@ -79,8 +77,7 @@ jobs:
nautobot-version:
- "2.0"
- "2.1"
# TODO: Enable 2.2 once it's released
# - "2.2"
- "2.2"
ansible-version:
- "2.14"
- "2.15"
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/trigger_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ jobs:
nautobot-version:
- "2.0"
- "2.1"
# TODO: Enable 2.2 once it's released
# - "2.2"
- "2.2"
ansible-version:
- "2.14"
- "2.15"
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ networktocode.nautobot Release Notes
.. contents:: Topics


v5.2.1
======

Minor Changes
-------------
- (#345) Added `NAUTOBOT_VALIDATE_CERTS` environment variable to disable SSL verification
- (#348) Fixed GraphQL Inventory plugin bug when device platform is None

v5.2.0
======

Expand Down
5 changes: 5 additions & 0 deletions changelogs/changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -444,3 +444,8 @@ releases:
- (#336) Added `custom_fields` to the `inventory_item` module
- (#338) Added `num_retries` to the `lookup` plugin
- (#340) Added `label` and `description` to the `device_interface_template` module
5.2.1:
changes:
minor_changes:
- (#345) Added `NAUTOBOT_VALIDATE_CERTS` environment variable to disable SSL verification
- (#348) Fixed GraphQL Inventory plugin bug when device platform is None
1 change: 0 additions & 1 deletion development/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ x-nautobot-base: &nautobot-base
- "dev.env"
tty: true

version: "3.8"
services:
nautobot:
build:
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
---
version: "3.4"
x-args:
&args
PYTHON_VER: ${PYTHON_VER}
Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/cable_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.cable module -- Create, update or delete cables within Na
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -618,6 +618,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -689,6 +691,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -723,6 +727,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/circuit_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.circuit module -- Create, update or delete circuits withi
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -662,6 +662,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -696,6 +698,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -730,6 +734,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/circuit_termination_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.circuit_termination module -- Create, update or delete ci
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -520,6 +520,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -591,6 +593,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -625,6 +629,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/circuit_type_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.circuit_type module -- Create, update or delete circuit t
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -327,6 +327,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -361,6 +363,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -395,6 +399,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/cluster_group_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.cluster_group module -- Create, update or delete cluster
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -327,6 +327,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -361,6 +363,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -395,6 +399,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/cluster_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.cluster module -- Create, update or delete clusters withi
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -549,6 +549,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -583,6 +585,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -617,6 +621,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/cluster_type_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.cluster_type module -- Create, update or delete cluster t
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -327,6 +327,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -361,6 +363,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -395,6 +399,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/console_port_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.console_port module -- Create, update or delete console p
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -401,6 +401,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -472,6 +474,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -506,6 +510,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
8 changes: 7 additions & 1 deletion docs/plugins/console_port_template_module.rst
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ networktocode.nautobot.console_port_template module -- Create, update or delete
.. Collection note
.. note::
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.0).
This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 5.2.1).

To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
You need further requirements to be able to use this module,
Expand Down Expand Up @@ -327,6 +327,8 @@ Parameters

The token created within Nautobot to authorize API access

Can be omitted if the \ :envvar:`NAUTOBOT\_TOKEN`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -398,6 +400,8 @@ Parameters

The URL of the Nautobot instance resolvable by the Ansible host (for example: http://nautobot.example.com:8000)

Can be omitted if the \ :envvar:`NAUTOBOT\_URL`\ environment variable is configured.


.. raw:: html

Expand Down Expand Up @@ -432,6 +436,8 @@ Parameters

If \ :literal:`no`\ , SSL certificates will not be validated. This should only be used on personally controlled sites using self-signed certificates.

Can be omitted if the \ :envvar:`NAUTOBOT\_VALIDATE\_CERTS`\ environment variable is configured.


.. rst-class:: ansible-option-line

Expand Down
Loading

0 comments on commit 0f213b9

Please sign in to comment.