Permalink
Browse files

Merge branch 'devel' into combine_vars

  • Loading branch information...
2 parents 70f9b97 + 9c5028e commit 8cc588e11b9e73352293c3f49b4f7fc467b1f988 @laggyluke committed Mar 26, 2013
View
@@ -1,6 +1,7 @@
# build products...
*.py[co]
build
+AUTHORS.TXT
# Emacs backup files...
*~
.\#*
View
@@ -1,221 +0,0 @@
-Michael DeHaan <michael.dehaan@gmail.com>
-Daniel Hokka Zakrisson <daniel@hozac.com>
-Stephen Fromm <sfromm@gmail.com>
-Seth Vidal <skvidal@fedoraproject.org>
-Tim Bielawa <tbielawa@redhat.com>
-Dag Wieers <dag@wieers.com>
-Jan-Piet Mens <jpmens@gmail.com>
-Jeroen Hoekx <jeroen.hoekx@hamok.be>
-Lorin Hochstein <lorin@nimbisservices.com>
-Michel Blanc <mb@mbnet.fr>
-Stephen Fromm <stephenf@nero.net>
-Marco Vito Moscaritolo <mavimo@gmail.com>
-Matthew Williams <matthew@flowroute.com>
-Mark Theunissen <mark.theunissen@gmail.com>
-Brian Coca <briancoca+ansible@gmail.com>
-Dave Hatton <mail@davehatton.it>
-Pepe Barbe <dev@antropoide.net>
-Peter Sankauskas <pas256@gmail.com>
-Derek Carter <goozbach@friocorte.com>
-John Kleint <jkleint@gmail.com>
-Dane Summers <dsummersl@yahoo.com>
-Romeo Theriault <romeot@hawaii.edu>
-Matt Wright <mdw1980@gmail.com>
-Nigel Metheringham <nigel.metheringham@jrtheatre.co.uk>
-Brad Olson <brado@movedbylight.com>
-Chris Hoffman <christopher.hoffman@gmail.com>
-fdavis <reddot357@hotmail.com>
-Jeroen Hoekx <jeroen@hoekx.be>
-Timothy Appnel <tim@appnel.com>
-Brian Coca <briancoca+dev@gmail.com>
-Daniel Néri <dne@mayonnaise.net>
-Dietmar Schinnerl <SleeplessAnnoyedNerd+github@gmail.com>
-Nikhil Singh <nix85@ymail.com>
-Tim Gerla <tim@gerla.net>
-Wes Johnson <wes@futureprefect.com>
-jkleint <jkleint@gmail.com>
-Christopher Johnston <chjohnst@gmail.com>
-Jimmy Tang <jtang@tchpc.tcd.ie>
-Nigel Metheringham <nigel.metheringham@dev.intechnology.co.uk>
-Rodney Quillo <imcocoy@gmail.com>
-Stoned Elipot <stoned.elipot@gmail.com>
-Yeukhon Wong <yeukhon@acm.org>
-Yves Dorfsman <yves@zioup.com>
-lwade <lestertron@gmail.com>
-Anastasis Andronidis <anastasis90@yahoo.gr>
-Dag Wieërs <dag@wieers.com>
-Ludovic Claude <ludovic.claude@lbpoker.com>
-Shaun Zinck <shaun.zinck@gmail.com>
-cocoy <imcocoy@gmail.com>
-Ahmad Khayyat <akhayyat@gmail.com>
-Aleksej Romanov <alopropoz2@yandex.ru>
-Aurélien Bondis <aurelien.bondis@gmail.com>
-Fabian Arrotin <fabian.arrotin@arrfab.net>
-Fred Alger <fred@fredalger.net>
-Gregory Duchatelet <skygreg@gmail.com>
-Henry Graham <henry.graham@mail.wvu.edu>
-Ingo Gottwald <i.gottwald@tomorrow-focus.de>
-Jeremy Smitherman <jeremysmitherman@gmail.com>
-Jim Richardson <weaselkeeper@gmail.com>
-Johan Wirén <johan.wiren@init.se>
-Matt Wright <matt@nobien.net>
-Peter Sankauskas <peter@admobius.com>
-Petros Moisiadis <pmoisiadis@modulus.gr>
-Serge van Ginderachter <serge@vanginderachter.be>
-Blair Zajac <blair@imageworks.com>
-Chris Hoffman <choffman@chathamfinancial.com>
-Christoph Seitz <christoph_seitz@gmx.de>
-Cosmin Luță <q4break@gmail.com>
-Félix Sipma <gueux@gueux.org>
-Grzegorz Nosek <root@localdomain.pl>
-Hubert Feyrer <hubertf@gmx.de>
-John Callender <jbc@jbcsystems.com>
-John Eckersberg <jeckersb@redhat.com>
-Jonathan Palley <jpalley@gmail.com>
-Kavin Kankeshwar <kavin@aerospike.com>
-Lester Wade <lestertron@gmail.com>
-Luke Antins <luke@lividpenguin.com>
-Maxim Burgerhout <maxim@wzzrd.com>
-Nigel Metheringham <nigel@dotdot.it>
-Norman J. Harman Jr <njharman@gmail.com>
-Remy <rvanelst@digidentity.eu>
-Sebastien Bocahu <sebastien@ispfr.net>
-Silviu Dicu <silviudicu@gmail.com>
-Sundar Raman <cybertoast@gmail.com>
-Will Thames <willdthames@gmail.com>
-lessmian <lessmian@lessmian.pl>
-willthames <willdthames@gmail.com>
-Brendan Beveridge <brendan.beveridge@zeptonics.com>
-Brian Coca <bcoca@tablethotels.com>
-Chelsea Robb <crobb@yourtutor.com.au>
-Ingo Gottwald <ingo@net-freakz.de>
-James Martin <jmartin@basho.com>
-Jeremy Katz <jeremy@katzbox.net>
-Jesse Andrews <anotherjesse@gmail.com>
-Johan Wirén <johan.wiren.se@gmail.com>
-Junegunn Choi <junegunn.c@gmail.com>
-Les Aker <me@lesaker.org>
-Lorin Hochstein <lorinh@gmail.com>
-Marco Vito Moscaritolo <marco@mavimo.org>
-Matt Coddington <coddington@gmail.com>
-Matthew Johnson <mjjohnson33@gmail.com>
-Maykel Moya <mmoya@mmoya.org>
-Nathan A. Feger <nfeger@spredfast.com>
-Patrick Pelletier <pp.pelletier@gmail.com>
-Patrik Lundin <patrik.lundin.swe@gmail.com>
-Pepe Barbe <barbe@telsasoft.com>
-Philipp Grau <phgrau@zedat.fu-berlin.de>
-Rafal Lewczuk <rafal.lewczuk@gmail.com>
-Scott Anderson <scottanderson42@gmail.com>
-Stijn Opheide <stijn@webcomrades.com>
-Ton Kersten <tonk@master.tonkersten.com>
-Will Thames <will@musc.org.uk>
-afterburn <afterburn>
-bradobro <brado@movedbylight.com>
-u348095 <will.thames@suncorp.com.au>
-willthames <will@musc.org.uk>
-willthames <will@thames.id.au>
-Ali Asad Lotia <ali.asad.lotia@gmail.com>
-Ashley Penney <apenney@edx.org>
-Brendan Taylor <brendan@inkdit.com>
-Chin Fang <fangchin@zettar.com>
-Chris Geddings <chris.geddings@duke.edu>
-Dave Peticolas <dave@krondo.com>
-Florian Diebold <flodiebold@gmail.com>
-Igor Galić <i.galic@brainsware.org>
-Javier Candeira <javier@candeira.com>
-Jayson Vantuyl <jayson@aggressive.ly>
-Josh Mandel <joshua.mandel@childrens.harvard.edu>
-Juha Litola <juha.litola@iki.fi>
-Jure Triglav <juretriglav@gmail.com>
-Martijn Koster <mak-github@greenhills.co.uk>
-Matt Cordial <matt.cordial@asu.edu>
-Matt Goodall <matt.goodall@gmail.com>
-Michael Lambert <mklambert@gmail.com>
-Nandor Sivok <nandor@gawker.com>
-Piffey Parlance <piffey@piffey.net>
-Remy van Elst <relst@relst.nl>
-Rune Kaagaard <rumi.kg@gmail.com>
-Stavros Korokithakis <stavros@korokithakis.net>
-Till Maas <opensource@till.name>
-Ton Kersten <tonk@tonkersten.com>
-Vincent Van der Kussen <vincent@vanderkussen.org>
-Yvan Cottyn <vanten@me.com>
-alex <alex@zabimaru.(none)>
-bleader <bleader@ratonland.org>
-davixx <david.chanial@gmail.com>
-felix <felix@ordrin.com>
-igor <igor@c-base.org>
-martin f. krafft <madduck@madduck.net>
-ron1 <wmdc1987@aol.com>
-schmic <mic+git@buks.eu.org>
-willthames <will.thames@suncorp.com.au>
-ADRIyas <adriyas@gmail.com>
-Adam Denenberg <adam@dberg.org>
-Alan Orth <alan.orth@gmail.com>
-Alexandre Bourget <alex@bourget.cc>
-Bowe Strickland <bowe@yak.net>
-Boyd Adamson <boyd@boydadamson.com>
-Brandon Alexander <baalexander@gmail.com>
-Chandler Latour <chandler.latour@gmail.com>
-Chris Berkhout <chrisberkhout@gmail.com>
-Chris Read <chris.read@gmail.com>
-Christopher A. Snapp <snappca@gmail.com>
-Cliffano Subagio <cliffano@gmail.com>
-Collin Allen <collin@command-tab.com>
-Daniel Néri <dne+github@mayonnaise.net>
-Dave Coutu <cout@alum.wpi.edu>
-Dave Peticolas <dpeticol@lucasfilm.com>
-Devin Bayer <dbayer@ripe.net>
-Elliott Foster <elliottf@codebrews.com>
-Fabian Arrotin <arrfab@centos.org>
-Felix Ingram <f.ingram@gmail.com>
-Francesc Esplugas <contact@francescesplugas.com>
-Francis Besset <francis.besset@gmail.com>
-Gary Richards <garyr@gasid.org.uk>
-Gert Goet <gert@thinkcreate.nl>
-Jeff Blaine <jblaine@kickflop.net>
-Jens Rantil <jens.rantil@gmail.com>
-Jeremiah Heller <jeremiah@inertialbit.net>
-Jeremy Penner <jeremy@sporktania.com>
-Joel Roller <roller@snth.net>
-John Gosset <john.gosset@gmail.com>
-Jonathan Palley <jpalley@idapted.com>
-Jonte Norman <jonte.n@gmail.com>
-Joshua Tacoma <joshua@yellowseed.org>
-K. Preyk <a.laas@asco.de>
-Lennie <github@consolejunkie.net>
-Lester Wade <lwade@dreadnought.home.gateway>
-Mark Maas <mark@maas-martin.nl>
-Marko Mikulicic <marko.mikulicic@isti.cnr.it>
-Matt Klich <matt.klich@readytalk.com>
-Matthew Johnson <mjohnson@blackboard.com>
-Max Spransy <maxjustus@gmail.com>
-Miek Gieben <miek@miek.nl>
-Mikael Zayenz Lagerkvist <zayenz@gmail.com>
-Mike Grozak <mike.grozak@gmail.com>
-Nathan A. Feger <nafeger@gmail.com>
-Oscar Korz <okorz001@gmail.com>
-Petetin Ludovic <ludovic@powder-lx.(none)>
-Piotr Kweclich <piotr.kweclich@contium.pl>
-Piotr Kweclich <piotrkweclich@gmail.com>
-Piotr Roszatycki <piotr.roszatycki@gmail.com>
-Ralph Bean <rbean@redhat.com>
-Reed Murphy <reed@reedmurphy.net>
-Rob Parrott <robparrott@gmail.com>
-Romeo Theriault <romeot@mbp.local>
-Sergey Popov <admin@pinkbyte.ru>
-Sri Harsha Yalamanchili <harsha@thought-matrix.com>
-Stanis Trendelenburg <stanis.trendelenburg@gmail.com>
-Stefane Fermigier <sf@fermigier.com>
-Steve Frank <lardcanoe@gmail.com>
-Sébastien Bocahu <zecrazytux@zecrazytux.net>
-Ton Kersten <github@tonkersten.com>
-diefans <oliver@digitalarchitekt.de>
-ftao <filia.tao@gmail.com>
-jibs <jibran.s+gh@gmail.com>
-junyoung <junyoung@daumcorp.com>
-mxxcon <mxxcon@gmail.com>
-root <root@admvmcctl001.adm.ops>
-shlomozippel <shlomo.zippel@gmail.com>
-vincent Van der Kussen <vincent@localhost.localdomain>
View
@@ -23,27 +23,27 @@ Core Features
Modules Added:
-* rabbit_mq plugin module
-* rabbit_mq user module
-* rabbit_mq vhost module
-* rabbit_mq parameter module
-* mongodb_user module
-* new uri module -- can get/put/post/etc
-* CloudFormation module
-* zfs
-* okg
-* macports
+* bzr (bazaar version control)
+* cloudformation
+* django-manage
+* gem (ruby gems)
* homebrew
-* gem
+* lvg (logical volume groups)
* lvol (LVM logical volumes)
-* django-manage
-* openbsd_pkg
+* macports
+* mongodb_user
* netscaler
-* bzr (bazaar version control)
-* lvg (logical volume groups)
-* s3 (allows putting file contents in buckets for sharing over s3)
-* vagrant (launching VMs with vagrant, this is different from existing vagrant plugin)
-
+* okg
+* openbsd_pkg
+* rabbit_mq_plugin
+* rabbit_mq_user
+* rabbit_mq_vhost
+* rabbit_mq_parameter
+* rhn_channel
+* s3 -- allows putting file contents in buckets for sharing over s3
+* uri module -- can get/put/post/etc
+* vagrant -- launching VMs with vagrant, this is different from existing vagrant plugin
+* zfs
Bugfixes and Misc Changes:
@@ -66,6 +66,10 @@ Bugfixes and Misc Changes:
* cowsay able to run out of macports (very important!)
* improved logging for fireball mode
* nicer error message when talking to an older system that needs a JSON module installed
+* 'magic' variable 'inventory_basedir' now gives path to inventory file
+* 'magic' variable 'vars' works like 'hostvars' but gives global scope variables, useful for debugging in templates mostly
+* conditionals can be used on plugins like add_host
+* developers: all callbacks now have access to a ".runner" and ".playbook", ".play", and ".task" object (use getattr, they may not always be set!)
Facts:
@@ -125,6 +129,10 @@ Module Changes/Fixes:
* fix default logins when no my.conf for MySQL module
* option to create users with non-unique UIDs (user module)
* macports module can enable/disable packages
+* quotes in my.cnf are stripped by the MySQL modules
+* Solaris Service management added
+* service module will attempt to auto-add unmanaged chkconfig services when needed
+* service module supports systemd service unit files
Plugins:
View
@@ -117,6 +117,8 @@ clean:
rm -rf deb-build
rm -rf docs/json
rm -rf docs/js
+ @echo "Cleaning up authors file"
+ rm -f AUTHORS.TXT
python:
$(PYTHON) setup.py build
@@ -134,6 +134,8 @@
{%- block footer %}
<footer class="footer">
+<center>
+<a href="http://ansibleworks.com"><img src="http://ansible.cc/img/AnsibleWorks.png" alt="AnsibleWorks"></a>
<p>
{%- if show_copyright %}
{%- if hasdoc('copyright') %}
@@ -147,6 +149,7 @@
{%- endif %}
</p>
</div>
+</center>
</footer>
{%- endblock %}
View
@@ -25,7 +25,7 @@
sys.path.append(os.path.abspath('_themes'))
VERSION='0.01'
-AUTHOR='Michael DeHaan'
+AUTHOR='AnsibleWorks'
# General configuration
@@ -51,7 +51,7 @@
# General substitutions.
project = 'Ansible Documentation'
-copyright = "2012 Michael DeHaan"
+copyright = "2013 AnsibleWorks"
# The default replacements for |version| and |release|, also used in various
# other places throughout the built documents.
@@ -1,6 +1,10 @@
YAML Syntax
===========
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://ansibleworks.com/fest
+
This page provides a basic overview of correct YAML syntax, which is how Ansible
playbooks (our configuration management language) are expressed.
View
@@ -1,6 +1,11 @@
API & Integrations
==================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://ansibleworks.com/fest
+
+
There are several interesting ways to use Ansible from an API perspective. You can use
the Ansible python API to control nodes, you can extend Ansible to respond to various python events,
and you can plug in inventory data from external data sources. Ansible is written in its own
@@ -1,6 +1,11 @@
Best Practices
==============
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://ansibleworks.com/fest/
+
+
Here are some tips for making the most of Ansible.
You can find some example playbooks illustrating these best practices in our `ansible-examples repository <https://github.com/ansible/ansible-examples>`_.
View
@@ -1,6 +1,11 @@
Ansible Resources
=================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://ansibleworks.com/fest
+
+
User contributed playbooks, modules, and articles. This is a small
curated list, but growing. Everyone is encouraged to add to this
document, just send in a github pull request to docsite/rst/contrib.rst!
View
@@ -1,6 +1,10 @@
Command Line Examples And Next Steps
====================================
+.. image:: http://ansible.cc/docs/_static/ansible_fest_2013.png
+ :alt: ansiblefest 2013
+ :target: http://ansibleworks.com/fest
+
.. highlight:: bash
The following examples show how to use `/usr/bin/ansible` for running
Oops, something went wrong.

0 comments on commit 8cc588e

Please sign in to comment.