summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/ansible-pull5
-rw-r--r--docs/man/man1/ansible-pull.1.asciidoc.in4
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