Various syntax and layout things, add Galaxy to docs

pull/5382/head
Michael DeHaan 11 years ago
parent d481b6e686
commit d6ea5be20f

@ -9,9 +9,7 @@ Rackspace Cloud Guide
Introduction
````````````
.. note:: This section of the documentation is under construction. We are in the process of adding more examples about the Rackspace modules
and how they work together. Once complete, there will also be examples for
Rackspace Cloud in `ansible-examples <http://github.com/ansible/ansible-examples/>`_.
.. note:: This section of the documentation is under construction. We are in the process of adding more examples about the Rackspace modules and how they work together. Once complete, there will also be examples for Rackspace Cloud in `ansible-examples <http://github.com/ansible/ansible-examples/>`_.
Ansible contains a number of core modules for interacting with Rackspace Cloud.
@ -127,8 +125,6 @@ Here's what it would look like in a playbook, assuming the parameters were defin
By registering the return value of the step, it is then possible to dynamically add the resulting hosts to inventory (temporarily, in memory).
This facilitates performing configuration actions on the hosts immediately in a subsequent task::
.. code-block:: yaml
- name: Add the instances we created (by public IP) to the group 'raxhosts'
local_action:
module: add_host
@ -139,9 +135,7 @@ This facilitates performing configuration actions on the hosts immediately in a
with_items: rax.success
when: rax.action == 'create'
With the host group now created, a second play in your provision playbook could now configure them, for example:
.. code-block:: yaml
With the host group now created, a second play in your provision playbook could now configure them, for example::
- name: Configuration play
hosts: raxhosts
@ -183,10 +177,7 @@ rax.py
To use the rackspace dynamic inventory script, copy ``rax.py`` from ``plugins/inventory`` into your inventory directory. You can specify credentials
for ``rax.py`` utilizing the ``RAX_CREDS_FILE`` environment variable.
.. note:: Users of AnsibleWorks AWX will note that dynamic inventory is natively supported by AWX, and all you have to do is associate
a group with your Rackspace Cloud credentials, and it will easily synchronize without going through these steps.
.. code-block:: bash
.. note:: Users of AnsibleWorks AWX will note that dynamic inventory is natively supported by AWX, and all you have to do is associate a group with your Rackspace Cloud credentials, and it will easily synchronize without going through these steps::
$ RAX_CREDS_FILE=~/.raxpub ansible all -i rax.py -m setup

@ -1,5 +1,5 @@
Tutorial: Rolling Upgrades for Continuous Delivery
==================================================
Continuous Delivery and Rolling Upgrades
========================================
.. contents::
:depth: 2
@ -14,8 +14,8 @@ Continuous Delivery is the concept of frequently delivering updates to your soft
The idea is that my updating more often, you not only have to wait for specific timed period, but your organization
gets better at the process of responding to change.
Some Ansible users are deploying updates to their end users on an hourly or even more frequent basis.
To achieve this, you need tools to be able to quickly apply those updates in a zero-downtime way.
Some Ansible users are deploying updates to their end users on an hourly or even more frequent basis -- sometimes every time
there is an approved code change. To achieve this, you need tools to be able to quickly apply those updates in a zero-downtime way.
This document describes in detail how to achieve this goal, using one of Ansible's most complete example
playbooks as a template: lamp_haproxy. This example uses a lot of Ansible features: roles, templates,
@ -24,7 +24,7 @@ rolling upgrades of the web application stack.
.. note::
You can always find the latest playbooks for this example `here
`Click here for the latest playbooks for this example`
<https://github.com/ansible/ansible-examples/tree/master/lamp_haproxy>`_.
The playbooks deploy Apache, PHP, MySQL, Nagios, and HAProxy to a CentOS-based set of servers.

@ -127,6 +127,22 @@ Find out more about AWX features and how to download it on the `AWX webpage <htt
is free for usage for up to 10 nodes, and comes bundled with amazing support from AnsibleWorks. As you would expect, AWX is
installed using Ansible playbooks!
.. _ansibleworks_galaxy:
AnsibleWorks Galaxy
```````````````````
.. image:: https://galaxy.ansibleworks.com/static/img/galaxy_logo_small.png
:alt: AnsibleWorks Galaxy Logo
:width: 619px
:height: 109px
`AnsibleWorks Galaxy <http://galaxy.ansibleworks.com>`_, is a free site for finding, downloading, rating, and reviewing all kinds of community developed Ansible roles and can be a great way to get a jumpstart on your automation projects.
You can sign up with social auth, and the download client 'ansible-galaxy' is included in Ansible 1.4.2 and later.
Read the "About" page on the Galaxy site for more information.
.. _detailed_guides:
Detailed Guides

@ -320,6 +320,20 @@ The resulting order of execution would be as follows::
.. note::
Variable inheritance and scope are detailed in the :doc:`playbooks_variables`.
AnsibleWorks Galaxy
```````````````````
.. image:: https://galaxy.ansibleworks.com/static/img/galaxy_logo_small.png
:alt: AnsibleWorks Galaxy Logo
:width: 619px
:height: 109px
`AnsibleWorks Galaxy <http://galaxy.ansibleworks.com>`_, is a free site for finding, downloading, rating, and reviewing all kinds of community developed Ansible roles and can be a great way to get a jumpstart on your automation projects.
You can sign up with social auth, and the download client 'ansible-galaxy' is included in Ansible 1.4.2 and later.
Read the "About" page on the Galaxy site for more information.
.. seealso::
:doc:`YAMLSyntax`

Loading…
Cancel
Save