diff options
| author | Michael Scherer <misc@zarb.org> | 2013-10-13 11:42:09 +0200 |
|---|---|---|
| committer | Michael Scherer <misc@zarb.org> | 2013-10-13 15:34:56 +0200 |
| commit | 92147aff0ff1c886eea2cfb48007fd1c41e46871 (patch) | |
| tree | b1fb0e54d33c514922532085a36ffbb940a852df | |
| parent | ansible-pull by default will look for local.yml and $fqdn.yml. (diff) | |
| download | ansible-92147aff0ff1c886eea2cfb48007fd1c41e46871.tar.xz ansible-92147aff0ff1c886eea2cfb48007fd1c41e46871.zip | |
also fix the doc, forgot in last commit
| -rwxr-xr-x | bin/ansible-pull | 5 | ||||
| -rw-r--r-- | docs/man/man1/ansible-pull.1.asciidoc.in | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/bin/ansible-pull b/bin/ansible-pull index 66782969c5..9f340bb349 100755 --- a/bin/ansible-pull +++ b/bin/ansible-pull @@ -32,8 +32,9 @@ # for playbooks in the following order, stopping at the first match: # # 1. $workdir/path/playbook.yml, if specified -# 2. $workdir/$hostname.yml -# 3. $workdir/local.yml +# 2. $workdir/$fqdn.yml +# 3. $workdir/$hostname.yml +# 4. $workdir/local.yml # # the source repo must contain at least one of these playbooks. diff --git a/docs/man/man1/ansible-pull.1.asciidoc.in b/docs/man/man1/ansible-pull.1.asciidoc.in index 809ec00057..d723b610d8 100644 --- a/docs/man/man1/ansible-pull.1.asciidoc.in +++ b/docs/man/man1/ansible-pull.1.asciidoc.in @@ -43,8 +43,8 @@ OPTIONAL ARGUMENT The name of one the YAML format files to run as an ansible playbook. This can be a relative path within the checkout. If not provided, ansible-pull -will look for a playbook based on the host's fully-qualified domain name and -finally a playbook named *local.yml*. +will look for a playbook based on the host's fully-qualified domain name, on the +host hostname and finally a playbook named *local.yml*. OPTIONS |