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

Merge Host.ipv[46]_address into .address

Browse source 
The earlier distinction was never used; .ipv6_address was always a copy
of .ipv4_address, and the latter was always used to set the remote_addr
field in the PlayContext.

Also uses the canonical ansible_host/ansible_port names when setting the
address and port from variables.
This commit is contained in:
Abhijit Menon-Sen 2015-09-17 23:00:05 +05:30
parent 3db8070aa3
commit 575a8b8c77
5 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/task_executor.py
View file

@ -460,7 +460,7 @@ class TaskExecutor:
# FIXME: calculation of connection params/auth stuff should be done here # FIXME: calculation of connection params/auth stuff should be done here
if not self._play_context.remote_addr: if not self._play_context.remote_addr:
self._play_context.remote_addr = self._host.ipv4_address self._play_context.remote_addr = self._host.address
if self._task.delegate_to is not None: if self._task.delegate_to is not None:
self._compute_delegate(variables) self._compute_delegate(variables)

2
lib/ansible/inventory/__init__.py
View file

@ -390,7 +390,7 @@ class Inventory(object):
new_host = Host(pattern) new_host = Host(pattern)
new_host.set_variable("ansible_python_interpreter", sys.executable) new_host.set_variable("ansible_python_interpreter", sys.executable)
new_host.set_variable("ansible_connection", "local") new_host.set_variable("ansible_connection", "local")
new_host.ipv4_address = '127.0.0.1' new_host.address = '127.0.0.1'
self.get_group("ungrouped").add_host(new_host) self.get_group("ungrouped").add_host(new_host)
return new_host return new_host

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

@ -46,8 +46,7 @@ class Host:
return dict( return dict(
name=self.name, name=self.name,
vars=self.vars.copy(), vars=self.vars.copy(),
ipv4_address=self.ipv4_address, address=self.address,
ipv6_address=self.ipv6_address,
gathered_facts=self._gathered_facts, gathered_facts=self._gathered_facts,
groups=groups, groups=groups,
) )
@ -57,8 +56,7 @@ class Host:
self.name = data.get('name') self.name = data.get('name')
self.vars = data.get('vars', dict()) self.vars = data.get('vars', dict())
self.ipv4_address = data.get('ipv4_address', '') self.address = data.get('address', '')
self.ipv6_address = data.get('ipv6_address', '')
groups = data.get('groups', []) groups = data.get('groups', [])
for group_data in groups: for group_data in groups:
@ -72,11 +70,10 @@ class Host:
self.vars = {} self.vars = {}
self.groups = [] self.groups = []
self.ipv4_address = name self.address = name
self.ipv6_address = name
if port: if port:
self.set_variable('ansible_ssh_port', int(port)) self.set_variable('ansible_port', int(port))
self._gathered_facts = False self._gathered_facts = False

4
lib/ansible/inventory/ini.py
View file

@ -255,8 +255,8 @@ class InventoryParser(object):
for h in hosts: for h in hosts:
for k in variables: for k in variables:
h.set_variable(k, variables[k]) h.set_variable(k, variables[k])
if k == 'ansible_ssh_host': if k in ['ansible_host', 'ansible_ssh_host']:
h.ipv4_address = variables[k] h.address = variables[k]
return hosts return hosts

2
lib/ansible/vars/hostvars.py
View file

@ -62,7 +62,7 @@ class HostVars(collections.Mapping):
new_host = Host(name='localhost') new_host = Host(name='localhost')
new_host.set_variable("ansible_python_interpreter", sys.executable) new_host.set_variable("ansible_python_interpreter", sys.executable)
new_host.set_variable("ansible_connection", "local") new_host.set_variable("ansible_connection", "local")
new_host.ipv4_address = '127.0.0.1' new_host.address = '127.0.0.1'
hosts.append(new_host) hosts.append(new_host)
for host in hosts: for host in hosts: