From d45a394f63d381bbef2e10ddbc8b2aff8334b8b0 Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Tue, 24 May 2016 11:37:04 -0700 Subject: [PATCH] Mocate ansible_ssh_changes into a common directory --- docsite/rst/faq.rst | 2 +- docsite/rst/guide_rax.rst | 2 +- docsite/rst/intro_inventory.rst | 4 ++-- docsite/rst/intro_windows.rst | 2 +- docsite/rst/playbooks_variables.rst | 2 +- docsite/{rst => rst_common}/ansible_ssh_changes_note.rst | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename docsite/{rst => rst_common}/ansible_ssh_changes_note.rst (100%) diff --git a/docsite/rst/faq.rst b/docsite/rst/faq.rst index cd0f191e782..efea43b7fef 100644 --- a/docsite/rst/faq.rst +++ b/docsite/rst/faq.rst @@ -23,7 +23,7 @@ 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. -.. include:: ansible_ssh_changes_note.rst +.. include:: ../rst_common/ansible_ssh_changes_note.rst For instance, suppose these hosts have different usernames and ports:: diff --git a/docsite/rst/guide_rax.rst b/docsite/rst/guide_rax.rst index b2ad6c0c0cf..d91622b8cbd 100644 --- a/docsite/rst/guide_rax.rst +++ b/docsite/rst/guide_rax.rst @@ -123,7 +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. -.. include:: ansible_ssh_changes_note.rst +.. include:: ../rst_common/ansible_ssh_changes_note.rst .. code-block:: yaml diff --git a/docsite/rst/intro_inventory.rst b/docsite/rst/intro_inventory.rst index f10dbd8a030..dbbba8bdbd7 100644 --- a/docsite/rst/intro_inventory.rst +++ b/docsite/rst/intro_inventory.rst @@ -65,7 +65,7 @@ For numeric patterns, leading zeros can be included or removed, as desired. Rang db-[a:f].example.com -.. include:: ansible_ssh_changes_note.rst +.. include:: ../rst_common/ansible_ssh_changes_note.rst You can also select the connection type and user on a per host basis: @@ -206,7 +206,7 @@ ansible_connection Connection type to the host. This can be the name of any of ansible's connection plugins. SSH protocol types are ``smart``, ``ssh`` or ``paramiko``. The default is smart. Non-SSH based types are described in the next section. -.. include:: ansible_ssh_changes_note.rst +.. include:: ../rst_common/ansible_ssh_changes_note.rst SSH connection: diff --git a/docsite/rst/intro_windows.rst b/docsite/rst/intro_windows.rst index aaffd7d9834..e99311f3937 100644 --- a/docsite/rst/intro_windows.rst +++ b/docsite/rst/intro_windows.rst @@ -158,7 +158,7 @@ Ansible's windows support relies on a few standard variables to indicate the use winserver1.example.com winserver2.example.com -.. include:: ansible_ssh_changes_note.rst +.. include:: ../rst_common/ansible_ssh_changes_note.rst In group_vars/windows.yml, define the following inventory variables:: diff --git a/docsite/rst/playbooks_variables.rst b/docsite/rst/playbooks_variables.rst index 5c5cad0ca93..33cd0652049 100644 --- a/docsite/rst/playbooks_variables.rst +++ b/docsite/rst/playbooks_variables.rst @@ -777,7 +777,7 @@ a use for it. If multiple variables of the same name are defined in different places, they get overwritten in a certain order. -.. include:: ansible_ssh_changes_note.rst +.. include:: ../rst_common/ansible_ssh_changes_note.rst In 1.x, the precedence is as follows (with the last listed variables winning prioritization): diff --git a/docsite/rst/ansible_ssh_changes_note.rst b/docsite/rst_common/ansible_ssh_changes_note.rst similarity index 100% rename from docsite/rst/ansible_ssh_changes_note.rst rename to docsite/rst_common/ansible_ssh_changes_note.rst