removed repetition of note and replaced with an include directive

ansible_ssh_* changes from 1.9 to 2.0, original note made into a separate file
for easier editing, and an include for this new file added to each of the 6 file affected
by this change
This commit is contained in:
Sandra Wills 2015-10-12 11:41:09 -04:00
parent 748ff72b6b
commit 32cb2fa215
7 changed files with 10 additions and 20 deletions

View file

@ -0,0 +1,3 @@
.. note::
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.

View file

@ -3,9 +3,6 @@ Frequently Asked Questions
Here are some commonly-asked questions and their answers. Here are some commonly-asked questions and their answers.
.. note::
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
.. _set_environment: .. _set_environment:
@ -25,6 +22,8 @@ How do I handle different machines needing different user accounts or ports to l
Setting inventory variables in the inventory file is the easiest way. Setting inventory variables in the inventory file is the easiest way.
.. include:: ansible_ssh_changes_note.rst
For instance, suppose these hosts have different usernames and ports:: For instance, suppose these hosts have different usernames and ports::
[webservers] [webservers]

View file

@ -123,9 +123,7 @@ Here's what it would look like in a playbook, assuming the parameters were defin
The rax module returns data about the nodes it creates, like IP addresses, hostnames, and login passwords. By registering the return value of the step, it is possible used this data to dynamically add the resulting hosts to inventory (temporarily, in memory). This facilitates performing configuration actions on the hosts in a follow-on task. In the following example, the servers that were successfully created using the above task are dynamically added to a group called "raxhosts", with each nodes hostname, IP address, and root password being added to the inventory. The rax module returns data about the nodes it creates, like IP addresses, hostnames, and login passwords. By registering the return value of the step, it is possible used this data to dynamically add the resulting hosts to inventory (temporarily, in memory). This facilitates performing configuration actions on the hosts in a follow-on task. In the following example, the servers that were successfully created using the above task are dynamically added to a group called "raxhosts", with each nodes hostname, IP address, and root password being added to the inventory.
.. note:: .. include:: ansible_ssh_changes_note.rst
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
.. code-block:: yaml .. code-block:: yaml

View file

@ -105,9 +105,7 @@ inventory file may look something like this:
machine ansible_host=127.0.0.1 ansible_port=2222 machine ansible_host=127.0.0.1 ansible_port=2222
.. note:: .. include:: ansible_ssh_changes_note.rst
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
If you want to run Ansible manually, you will want to make sure to pass If you want to run Ansible manually, you will want to make sure to pass
``ansible`` or ``ansible-playbook`` commands the correct arguments for the ``ansible`` or ``ansible-playbook`` commands the correct arguments for the

View file

@ -65,11 +65,7 @@ For numeric patterns, leading zeros can be included or removed, as desired. Rang
db-[a:f].example.com db-[a:f].example.com
You can also select the connection type and user on a per host basis:: .. include:: ansible_ssh_changes_note.rst
.. note::
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
You can also select the connection type and user on a per host basis: You can also select the connection type and user on a per host basis:

View file

@ -154,9 +154,7 @@ Ansible's windows support relies on a few standard variables to indicate the use
winserver1.example.com winserver1.example.com
winserver2.example.com winserver2.example.com
.. note:: .. include:: ansible_ssh_changes_note.rst
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
In group_vars/windows.yml, define the following inventory variables:: In group_vars/windows.yml, define the following inventory variables::

View file

@ -735,9 +735,7 @@ a use for it.
If multiple variables of the same name are defined in different places, they get overwritten in a certain order. If multiple variables of the same name are defined in different places, they get overwritten in a certain order.
.. note:: .. include:: ansible_ssh_changes_note.rst
Ansible 2.0 has deprecated the “ssh” from ``ansible_ssh_user``, ``ansible_ssh_host``, and ``ansible_ssh_port`` to become ``ansible_user``, ``ansible_host``, and ``ansible_port``. If you are using a version of Ansible prior to 2.0, you should continue using the older style variables (``ansible_ssh_*``). These shorter variables are ignored, without warning, in older versions of Ansible.
In 1.x the precedence is: In 1.x the precedence is: