From 757574ee035dbf4a32eb428c4ac0731a94a818b4 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 27 Feb 2012 21:13:44 -0500 Subject: [PATCH 1/4] Make templating example make more sense --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fa83a4056a2..db136a46057 100644 --- a/README.md +++ b/README.md @@ -88,9 +88,9 @@ Templating JSON files can be placed for template metadata using Jinja2. Variables placed by 'setup' can be reused between ansible runs. - * ansible -p "*" -n setup -a "ntp_server=192.168.1.1" + * ansible -p "*" -n setup -a "favcolor=red ntp_server=192.168.1.1" * ansible -p "*" -n template /srv/motd.j2 /etc/motd - * ansible -p "*" -n template /srv/foo.j2 /etc/foo + * ansible -p "*" -n template /srv/ntp.j2 /etc/ntp.conf Very soon, templates will be able to also include facter and ohai variables. From f32f5d5ac523d9d470c927a5fc2b8b7f94f1b7a1 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 27 Feb 2012 21:26:23 -0500 Subject: [PATCH 2/4] Fix markdown bullets --- README.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index db136a46057..33b8fa1da56 100644 --- a/README.md +++ b/README.md @@ -24,28 +24,28 @@ and the source will be blindingly obvious. Design Principles ================= - * Dead simple setup - * Super fast & parallel by default - * No server or client daemons; use existing SSHd - * No additional software required on client boxes - * Modules can be written in ANY language - * Awesome API for creating very powerful distributed scripts - * Be usable as non-root - * Create the easiest config management system to use, ever. + * Dead simple setup + * Super fast & parallel by default + * No server or client daemons; use existing SSHd + * No additional software required on client boxes + * Modules can be written in ANY language + * Awesome API for creating very powerful distributed scripts + * Be usable as non-root + * Create the easiest config management system to use, ever. Requirements ============ For the server the tool is running from, *only*: - * paramiko - * python 2.6 (or the 2.4/2.5 backport of the multiprocessing module) - * PyYAML (only if using playbooks) + * paramiko + * python 2.6 (or the 2.4/2.5 backport of the multiprocessing module) + * PyYAML (only if using playbooks) Optional -- If you want to push templates, the nodes need a template library, which for bonus points you can install with ansible! Easy enough. - * python-jinja2 + * python-jinja2 Inventory file ============== From 1ef19af4eb70f11a993cf929ad89f3a61636f58f Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 27 Feb 2012 21:27:18 -0500 Subject: [PATCH 3/4] More markdown formatting --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 33b8fa1da56..06e1432f0a6 100644 --- a/README.md +++ b/README.md @@ -126,13 +126,12 @@ together, and can even fire off triggers when certain commands report changes. They are the basis for a really simple configuration management system, unlike any that already exist. Powerful, concise, but dead simple. -See examples/playbook.yml for what the syntax looks like. +See examples/playbook.yml for what the syntax looks like, and the manpage -- ansible-playbook(5) for more details. To run a playbook: -ansible -r playbook.yml + ansible -r playbook.yml -Read ansible-playbook(5) for more details. Future plans ============ From 74cf509ea4cc16ff2b59dac978a5822cf0e95d9c Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 27 Feb 2012 21:31:18 -0500 Subject: [PATCH 4/4] More markdown. Might be done for now. Maybe. Grr, hate you markdown. --- README.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 06e1432f0a6..e2fadff821c 100644 --- a/README.md +++ b/README.md @@ -67,9 +67,9 @@ Massive Parallelism, Pattern Matching, and a Usage Example Reboot all web servers in Atlanta, 10 at a time: - * ssh-agent bash - * ssh-add ~/.ssh/id_rsa.pub - * ansible -p "atlanta-web*" -f 10 -n command -a "/sbin/reboot" + ssh-agent bash + ssh-add ~/.ssh/id_rsa.pub + ansible -p "atlanta-web*" -f 10 -n command -a "/sbin/reboot" Other than the comamnd module, though, ansible modules are not scripts. They make the remote system look like you state, and run the commands neccessary to get it @@ -80,7 +80,7 @@ File Transfer Ansible can SCP lots of files to lots of places in parallel. - * ansible -p "web-*.acme.net" -f 10 -n copy -a "/etc/hosts /tmp/hosts" + ansible -p "web-*.acme.net" -f 10 -n copy -a "/etc/hosts /tmp/hosts" Templating ========== @@ -88,9 +88,9 @@ Templating JSON files can be placed for template metadata using Jinja2. Variables placed by 'setup' can be reused between ansible runs. - * ansible -p "*" -n setup -a "favcolor=red ntp_server=192.168.1.1" - * ansible -p "*" -n template /srv/motd.j2 /etc/motd - * ansible -p "*" -n template /srv/ntp.j2 /etc/ntp.conf + ansible -p "*" -n setup -a "favcolor=red ntp_server=192.168.1.1" + ansible -p "*" -n template /srv/motd.j2 /etc/motd + ansible -p "*" -n template /srv/ntp.j2 /etc/ntp.conf Very soon, templates will be able to also include facter and ohai variables. @@ -100,7 +100,7 @@ Git Deployments Deploy your webapp straight from git - * ansible -p "web*" -n git -a "repo=git://foo dest=/srv/myapp version=HEAD" + ansible -p "web*" -n git -a "repo=git://foo dest=/srv/myapp version=HEAD" Take Inventory ============== @@ -108,8 +108,8 @@ Take Inventory Run popular open-source data discovery tools across a wide number of hosts. This is best used from API scripts that want to learn about remote systems. - * ansible -p "dbserver*" -n facter - * ansible -p "dbserver"" -n ohai + ansible -p "dbserver*" -n facter + ansible -p "dbserver"" -n ohai Other Modules ============= @@ -136,18 +136,19 @@ To run a playbook: Future plans ============ - * see github's issue tracker for what we're thinking about +See github's issue tracker for what we're thinking about License ======= - * MIT +MIT Mailing List ============ - * Join the mailing list to talk about Ansible! - * [ansible-project](http://groups.google.com/group/ansible-project) +Join the mailing list to talk about Ansible! + +[ansible-project](http://groups.google.com/group/ansible-project) Author ======