cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Changed 'Control Machine' to 'Control Node' (#51696)

Browse source 
* Changed 'Control Machine' to 'Control Node' in the documentation. Changing the term 'Control Machine' to 'Control Node', to be in line with the basic concepts here: https://docs.ansible.com/ansible/latest/network/getting_started/basic_concepts.html

Also for both entities; Control/Managed using the same common denominator 'Node' brings consistency.

* Updated reference links to new term.
This commit is contained in:
Richard Diphoorn 2019-02-08 20:40:10 +01:00 committed by Alicia Cozine
parent eb54dab362
commit ad549e375a
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/docsite/rst/dev_guide/developing_inventory.rst
View file

@ -50,7 +50,7 @@ Here are some plugins and the type of source they use:
Inventory plugins Inventory plugins
================= =================
Like most plugin types (except modules) they must be developed in Python, since they execute on the controller they should match the same requirements :ref:`control_machine_requirements`. Like most plugin types (except modules) they must be developed in Python, since they execute on the controller they should match the same requirements :ref:`control_node_requirements`.
Most of the documentation in :ref:`developing_plugins` also applies here, so as to not repeat ourselves, you should read that document first and we'll include inventory plugin specifics next. Most of the documentation in :ref:`developing_plugins` also applies here, so as to not repeat ourselves, you should read that document first and we'll include inventory plugin specifics next.

2
docs/docsite/rst/dev_guide/developing_plugins.rst
View file

@ -20,7 +20,7 @@ Once you've reviewed these general guidelines, you can skip to the particular ty
Writing plugins in Python Writing plugins in Python
========================= =========================
You must write your plugin in Python so it can be loaded by the ``PluginLoader`` and returned as a Python object that any module can use. Since your plugin will execute on the controller, you must write it in a :ref:`compatible version of Python <control_machine_requirements>`. You must write your plugin in Python so it can be loaded by the ``PluginLoader`` and returned as a Python object that any module can use. Since your plugin will execute on the controller, you must write it in a :ref:`compatible version of Python <control_node_requirements>`.
Raising errors Raising errors
============== ==============

12
docs/docsite/rst/installation_guide/intro_installation.rst
View file

@ -36,12 +36,12 @@ For other installation options, we recommend installing via "pip", which is the
If you wish to track the development release to use and test the latest features, we will share If you wish to track the development release to use and test the latest features, we will share
information about running from source. It's not necessary to install the program to run from source. information about running from source. It's not necessary to install the program to run from source.
.. _control_machine_requirements: .. _control_node_requirements:
Control Machine Requirements Control Node Requirements
```````````````````````````` ````````````````````````````
Currently Ansible can be run from any machine with Python 2 (version 2.7) or Python 3 (versions 3.5 and higher) installed. Windows isn't supported for the control machine. Currently Ansible can be run from any machine with Python 2 (version 2.7) or Python 3 (versions 3.5 and higher) installed. Windows isn't supported for the control node.
This includes Red Hat, Debian, CentOS, macOS, any of the BSDs, and so on. This includes Red Hat, Debian, CentOS, macOS, any of the BSDs, and so on.
@ -92,9 +92,9 @@ later).
$ ansible myhost --sudo -m raw -a "yum install -y python2" $ ansible myhost --sudo -m raw -a "yum install -y python2"
.. _installing_the_control_machine: .. _installing_the_control_node:
Installing the Control Machine Installing the Control Node
`````````````````````````````` ``````````````````````````````
.. _from_yum: .. _from_yum:
@ -345,7 +345,7 @@ open source projects.
.. note:: .. note::
If you are intending to use Tower as the Control Machine, do not use a source install. Please use OS package manager (like ``apt/yum``) or ``pip`` to install a stable version. If you are intending to use Tower as the Control Node, do not use a source install. Please use OS package manager (like ``apt/yum``) or ``pip`` to install a stable version.
To install from source, clone the Ansible git repository: To install from source, clone the Ansible git repository: