From 67d2d139975eed0b0c38ce3e0255d5ad06716d47 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Mon, 7 Jun 2021 20:53:14 +0200 Subject: [PATCH] Update inventory script references from c.g to ansible-community/contrib-scripts. (#74905) (#74927) (cherry picked from commit acf09e56a257d8b0548226cb9ab5ae9450df0d3d) --- docs/docsite/rst/scenario_guides/guide_azure.rst | 8 ++++---- docs/docsite/rst/scenario_guides/guide_docker.rst | 2 +- docs/docsite/rst/scenario_guides/guide_infoblox.rst | 4 ++-- docs/docsite/rst/scenario_guides/guide_packet.rst | 8 ++++---- docs/docsite/rst/user_guide/intro_dynamic_inventory.rst | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/docsite/rst/scenario_guides/guide_azure.rst b/docs/docsite/rst/scenario_guides/guide_azure.rst index 2317ade4a35..0a039c8a48d 100644 --- a/docs/docsite/rst/scenario_guides/guide_azure.rst +++ b/docs/docsite/rst/scenario_guides/guide_azure.rst @@ -286,14 +286,14 @@ Dynamic Inventory Script If you are not familiar with Ansible's dynamic inventory scripts, check out :ref:`Intro to Dynamic Inventory `. -The Azure Resource Manager inventory script is called `azure_rm.py `_. It authenticates with the Azure API exactly the same as the +The Azure Resource Manager inventory script is called `azure_rm.py `_. It authenticates with the Azure API exactly the same as the Azure modules, which means you will either define the same environment variables described above in `Using Environment Variables`_, create a ``$HOME/.azure/credentials`` file (also described above in `Storing in a File`_), or pass command line parameters. To see available command line options execute the following: .. code-block:: bash - $ wget https://raw.githubusercontent.com/ansible-collections/community.general/main/scripts/inventory/azure_rm.py + $ wget https://raw.githubusercontent.com/ansible-community/contrib-scripts/main/inventory/azure_rm.py $ ./azure_rm.py --help As with all dynamic inventory scripts, the script can be executed directly, passed as a parameter to the ansible command, @@ -397,7 +397,7 @@ If you don't need the powerstate, you can improve performance by turning off pow * AZURE_INCLUDE_POWERSTATE=no A sample azure_rm.ini file is included along with the inventory script in -`here `_. +`here `_. An .ini file will contain the following: .. code-block:: ini @@ -432,7 +432,7 @@ Here are some examples using the inventory script: .. code-block:: bash # Download inventory script - $ wget https://raw.githubusercontent.com/ansible-collections/community.general/main/scripts/inventory/azure_rm.py + $ wget https://raw.githubusercontent.com/ansible-community/contrib-scripts/main/inventory/azure_rm.py # Execute /bin/uname on all instances in the Testing resource group $ ansible -i azure_rm.py Testing -m shell -a "/bin/uname -a" diff --git a/docs/docsite/rst/scenario_guides/guide_docker.rst b/docs/docsite/rst/scenario_guides/guide_docker.rst index c3f019bd6c8..ccb48b4d11b 100644 --- a/docs/docsite/rst/scenario_guides/guide_docker.rst +++ b/docs/docsite/rst/scenario_guides/guide_docker.rst @@ -118,7 +118,7 @@ For working with a plain Docker daemon, that is without Swarm, there are connect docker_containers inventory plugin The :ref:`community.docker.docker_containers inventory plugin ` allows you to dynamically add Docker containers from a Docker Daemon to your Ansible inventory. See :ref:`dynamic_inventory` for details on dynamic inventories. - The `docker inventory script `_ is deprecated. Please use the inventory plugin instead. The inventory plugin has several compatibility options. If you need to collect Docker containers from multiple Docker daemons, you need to add every Docker daemon as an individual inventory source. + The `docker inventory script `_ is deprecated. Please use the inventory plugin instead. The inventory plugin has several compatibility options. If you need to collect Docker containers from multiple Docker daemons, you need to add every Docker daemon as an individual inventory source. docker_host_info module The :ref:`community.docker.docker_host_info module ` allows you to retrieve information on a Docker daemon, such as all containers, images, volumes, networks and so on. diff --git a/docs/docsite/rst/scenario_guides/guide_infoblox.rst b/docs/docsite/rst/scenario_guides/guide_infoblox.rst index d4597d90a0c..c7227c50b53 100644 --- a/docs/docsite/rst/scenario_guides/guide_infoblox.rst +++ b/docs/docsite/rst/scenario_guides/guide_infoblox.rst @@ -248,9 +248,9 @@ Dynamic inventory script You can use the Infoblox dynamic inventory script to import your network node inventory with Infoblox NIOS. To gather the inventory from Infoblox, you need two files: -- `infoblox.yaml `_ - A file that specifies the NIOS provider arguments and optional filters. +- `infoblox.yaml `_ - A file that specifies the NIOS provider arguments and optional filters. -- `infoblox.py `_ - The python script that retrieves the NIOS inventory. +- `infoblox.py `_ - The python script that retrieves the NIOS inventory. .. note:: diff --git a/docs/docsite/rst/scenario_guides/guide_packet.rst b/docs/docsite/rst/scenario_guides/guide_packet.rst index c08eb9477ef..2759ca4010f 100644 --- a/docs/docsite/rst/scenario_guides/guide_packet.rst +++ b/docs/docsite/rst/scenario_guides/guide_packet.rst @@ -208,9 +208,9 @@ Dynamic Inventory Script The dynamic inventory script queries the Packet API for a list of hosts, and exposes it to Ansible so you can easily identify and act on Packet devices. -You can find it in Ansible Community General Collection's git repo at `scripts/inventory/packet_net.py `_. +You can find it in Ansible Community General Collection's git repo at `scripts/inventory/packet_net.py `_. -The inventory script is configurable via a `ini file `_. +The inventory script is configurable via a `ini file `_. If you want to use the inventory script, you must first export your Packet API token to a PACKET_API_TOKEN environment variable. @@ -218,9 +218,9 @@ You can either copy the inventory and ini config out from the cloned git repo, o .. code-block:: bash - $ wget https://raw.githubusercontent.com/ansible-collections/community.general/main/scripts/inventory/packet_net.py + $ wget https://raw.githubusercontent.com/ansible-community/contrib-scripts/main/inventory/packet_net.py $ chmod +x packet_net.py - $ wget https://raw.githubusercontent.com/ansible-collections/community.general/main/scripts/inventory/packet_net.ini + $ wget https://raw.githubusercontent.com/ansible-community/contrib-scripts/main/inventory/packet_net.ini In order to understand what the inventory script gives to Ansible you can run: diff --git a/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst b/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst index 69016655e4b..24bef0a2bda 100644 --- a/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst +++ b/docs/docsite/rst/user_guide/intro_dynamic_inventory.rst @@ -28,7 +28,7 @@ Ansible integrates seamlessly with `Cobbler `_, a Lin While primarily used to kickoff OS installations and manage DHCP and DNS, Cobbler has a generic layer that can represent data for multiple configuration management systems (even at the same time) and serve as a 'lightweight CMDB'. -To tie your Ansible inventory to Cobbler, copy `this script `_ to ``/etc/ansible`` and ``chmod +x`` the file. Run ``cobblerd`` any time you use Ansible and use the ``-i`` command line option (for example, ``-i /etc/ansible/cobbler.py``) to communicate with Cobbler using Cobbler's XMLRPC API. +To tie your Ansible inventory to Cobbler, copy `this script `_ to ``/etc/ansible`` and ``chmod +x`` the file. Run ``cobblerd`` any time you use Ansible and use the ``-i`` command line option (for example, ``-i /etc/ansible/cobbler.py``) to communicate with Cobbler using Cobbler's XMLRPC API. Add a ``cobbler.ini`` file in ``/etc/ansible`` so Ansible knows where the Cobbler server is and some cache improvements can be used. For example: