Merge pull request #4484 from mscherer/add_short_hostname

ansible-pull by default will look for local.yml and $fqdn.yml.
This commit is contained in:
jctanner 2013-11-14 05:32:47 -08:00
commit 2d9087b806
2 changed files with 9 additions and 6 deletions

View file

@ -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.
@ -80,10 +81,12 @@ def select_playbook(path, args):
return None
return playbook
else:
hostpb = "%s/%s.yml" % (path, socket.getfqdn())
fqdn = socket.getfqdn()
hostpb = "%s/%s.yml" % (path, fqdn)
shorthostpb = "%s/%s.yml" % (path, fqdn.split('.')[0])
localpb = "%s/%s" % (path, DEFAULT_PLAYBOOK)
errors = []
for pb in [hostpb, localpb]:
for pb in [hostpb, shorthostpb, localpb]:
rc = try_playbook(pb)
if rc == 0:
playbook = pb

View file

@ -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