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

Merging docs

Browse source
This commit is contained in:
Xiao Hanyu 2013-07-20 12:44:15 -04:00 committed by Michael DeHaan
parent 10b967374d
commit 23ff2f2992
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docsite/latest/rst/amazon_web_services.rst
View file

@ -76,7 +76,7 @@ Once your nodes are spun up, you'll probably want to talk to them again. The be
Even for larger environments, you might have nodes spun up from Cloud Formations or other tooling. You don't have to use Ansible to spin up guests. Once these are created and you wish to configure them, the EC2 API can be used to return system grouping with the help of the EC2 inventory script. This script can be used to group resources by their security group or tags. Tagging is highly recommended in EC2 and can provide an easy way to sort between host groups and roles. The inventory script is documented `in the API chapter <http://www.ansibleworks.com/docs/api.html#external-inventory-scripts>`_.
You may wish to schedule a regular refresh of the inventory cache to accomodate for frequent changes in resources:
You may wish to schedule a regular refresh of the inventory cache to accommodate for frequent changes in resources:
.. code-block:: bash

4
docsite/latest/rst/faq.rst
View file

@ -32,7 +32,7 @@ See the rest of the documentation for more information about how to organize var
How do I get ansible to reuse connections, enable Kerberized SSH, or have Ansible pay attention to my local SSH config file?
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Switch your default connectiont type in the configuration file to 'ssh', or use '-c ssh' to use
Switch your default connection type in the configuration file to 'ssh', or use '-c ssh' to use
Native OpenSSH for connections instead of the python paramiko library. In Ansible 1.2.1 and later, 'ssh' will be used
by default if OpenSSH is new enough to support ControlPersist as an option.
@ -157,7 +157,7 @@ environment variable on management machine::
If you need to set environment variables, see the Advanced Playbooks section about environments.
Can I get training on Ansible or find commerical support?
Can I get training on Ansible or find commercial support?
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Yes! See `AnsibleWorks.com <http://ansibleworks.com>`_ or email `info@ansibleworks.com <mailto:info@ansibleworks.com>`_.

2
docsite/latest/rst/gettingstarted.rst
View file

@ -193,7 +193,7 @@ In Ubuntu 13.04 (raring) its part of the backports repository:
$ sudo apt-get install ansible/raring-backports
In Debian testing/unstable and Ubntu 13.10+ it is available via
In Debian testing/unstable and Ubuntu 13.10+ it is available via
.. code-block:: bash