cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11811 from amenonsen/fixme-range

Browse source 
FIXME in host range parsing
This commit is contained in:
Brian Coca 2015-08-12 09:06:39 -04:00
commit 8e30e3791e
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docsite/rst/intro_patterns.rst
View file

@ -72,9 +72,9 @@ As an advanced usage, you can also select the numbered server in a group::
webservers[0] webservers[0]
Or a portion of servers in a group:: Or a range of servers in a group::
webservers[0-25] webservers[0:25]
Most people don't specify patterns as regular expressions, but you can. Just start the pattern with a '~':: Most people don't specify patterns as regular expressions, but you can. Just start the pattern with a '~'::

11
lib/ansible/inventory/expand_hosts.py
View file

@ -75,12 +75,11 @@ def expand_hostname_range(line = None):
# of hosts and then repeat until none left. # of hosts and then repeat until none left.
# - also add an optional third parameter which contains the step. (Default: 1) # - also add an optional third parameter which contains the step. (Default: 1)
# so range can be [01:10:2] -> 01 03 05 07 09 # so range can be [01:10:2] -> 01 03 05 07 09
# FIXME: make this work for alphabetic sequences too.
(head, nrange, tail) = line.replace('[','|',1).replace(']','|',1).split('|') (head, nrange, tail) = line.replace('[','|',1).replace(']','|',1).split('|')
bounds = nrange.split(":") bounds = nrange.split(":")
if len(bounds) != 2 and len(bounds) != 3: if len(bounds) != 2 and len(bounds) != 3:
raise errors.AnsibleError("host range incorrectly specified") raise errors.AnsibleError("host range must be begin:end or begin:end:step")
beg = bounds[0] beg = bounds[0]
end = bounds[1] end = bounds[1]
if len(bounds) == 2: if len(bounds) == 2:
@ -90,11 +89,11 @@ def expand_hostname_range(line = None):
if not beg: if not beg:
beg = "0" beg = "0"
if not end: if not end:
raise errors.AnsibleError("host range end value missing") raise errors.AnsibleError("host range must specify end value")
if beg[0] == '0' and len(beg) > 1: if beg[0] == '0' and len(beg) > 1:
rlen = len(beg) # range length formatting hint rlen = len(beg) # range length formatting hint
if rlen != len(end): if rlen != len(end):
raise errors.AnsibleError("host range format incorrectly specified!") raise errors.AnsibleError("host range must specify equal-length begin and end formats")
fill = lambda _: str(_).zfill(rlen) # range sequence fill = lambda _: str(_).zfill(rlen) # range sequence
else: else:
fill = str fill = str
@ -103,8 +102,8 @@ def expand_hostname_range(line = None):
i_beg = string.ascii_letters.index(beg) i_beg = string.ascii_letters.index(beg)
i_end = string.ascii_letters.index(end) i_end = string.ascii_letters.index(end)
if i_beg > i_end: if i_beg > i_end:
raise errors.AnsibleError("host range format incorrectly specified!") raise errors.AnsibleError("host range must have begin <= end")
seq = string.ascii_letters[i_beg:i_end+1] seq = list(string.ascii_letters[i_beg:i_end+1:int(step)])
except ValueError: # not an alpha range except ValueError: # not an alpha range
seq = range(int(beg), int(end)+1, int(step)) seq = range(int(beg), int(end)+1, int(step))