ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Fixing more v2 bugs

Browse source
This commit is contained in:
James Cammarata 2015-01-29 16:43:50 -06:00
parent d57f7b4b9e
commit c978c77796
5 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
v2/ansible/modules/core

@ -1 +1 @@
Subproject commit 256ce9dd4dfbe2b0dc9eb5031812c8ab76418a22 Subproject commit e355f7bf12465ed3f25a2147d6940179db2a26aa

11
v2/ansible/playbook/conditional.py
View file

@ -53,7 +53,7 @@ class Conditional:
False if any of them evaluate as such. False if any of them evaluate as such.
''' '''
templar = Templar(loader=self._loader, variables=all_vars) templar = Templar(loader=self._loader, variables=all_vars, fail_on_undefined=False)
for conditional in self.when: for conditional in self.when:
if not self._check_conditional(conditional, templar, all_vars): if not self._check_conditional(conditional, templar, all_vars):
return False return False
@ -69,20 +69,15 @@ class Conditional:
if conditional is None or conditional == '': if conditional is None or conditional == '':
return True return True
# FIXME: is this required? there is no indication what it does # FIXME: this should be removable now, leaving it here just in case
#conditional = conditional.replace("jinja2_compare ","")
# allow variable names # allow variable names
#if conditional in all_vars and '-' not in str(all_vars[conditional]): #if conditional in all_vars and '-' not in str(all_vars[conditional]):
# conditional = all_vars[conditional] # conditional = all_vars[conditional]
conditional = templar.template(conditional, convert_bare=True) conditional = templar.template(conditional, convert_bare=True)
if not isinstance(conditional, basestring): if not isinstance(conditional, basestring) or conditional == "":
return conditional return conditional
# FIXME: same as above
#original = str(conditional).replace("jinja2_compare ","")
# a Jinja2 evaluation that results in something Python can eval! # a Jinja2 evaluation that results in something Python can eval!
presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional presented = "{%% if %s %%} True {%% else %%} False {%% endif %%}" % conditional
conditional = templar.template(presented) conditional = templar.template(presented)

8
v2/ansible/playbook/role/__init__.py
View file

@ -46,10 +46,18 @@ __all__ = ['Role', 'ROLE_CACHE', 'hash_params']
# in a static method. This is also used in the base class for # in a static method. This is also used in the base class for
# strategies (ansible/plugins/strategies/__init__.py) # strategies (ansible/plugins/strategies/__init__.py)
def hash_params(params): def hash_params(params):
if not isinstance(params, dict):
return params
else:
s = set() s = set()
for k,v in params.iteritems(): for k,v in params.iteritems():
if isinstance(v, dict): if isinstance(v, dict):
s.update((k, hash_params(v))) s.update((k, hash_params(v)))
elif isinstance(v, list):
things = []
for item in v:
things.append(hash_params(item))
s.update((k, tuple(things)))
else: else:
s.update((k, v)) s.update((k, v))
return frozenset(s) return frozenset(s)

2
v2/ansible/plugins/connections/ssh.py
View file

@ -279,7 +279,7 @@ class Connection(ConnectionBase):
# ssh_cmd += ['-6'] # ssh_cmd += ['-6']
ssh_cmd += [self._host.ipv4_address] ssh_cmd += [self._host.ipv4_address]
if not (self._connection_info.sudo or self._connection_info.su) or not sudoable: if not (self._connection_info.sudo or self._connection_info.su):
prompt = None prompt = None
if executable: if executable:
ssh_cmd.append(executable + ' -c ' + pipes.quote(cmd)) ssh_cmd.append(executable + ' -c ' + pipes.quote(cmd))

3
v2/ansible/vars/__init__.py
View file

@ -210,6 +210,9 @@ class VariableManager:
hostvars = HostVars(vars_manager=self, inventory=self._inventory, loader=loader) hostvars = HostVars(vars_manager=self, inventory=self._inventory, loader=loader)
all_vars['hostvars'] = hostvars all_vars['hostvars'] = hostvars
if self._inventory is not None:
all_vars['inventory_dir'] = self._inventory.basedir()
# the 'omit' value alows params to be left out if the variable they are based on is undefined # the 'omit' value alows params to be left out if the variable they are based on is undefined
all_vars['omit'] = self._omit_token all_vars['omit'] = self._omit_token