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

Fixing some bugs found during testing in the host module

Browse source
This commit is contained in:
James Cammarata 2013-09-23 16:05:43 -05:00
parent da0d50c383
commit 4420379f59
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -15,6 +15,7 @@ New modules:
* cloud:ec2_eip -- manage AWS elastic IP's * cloud:ec2_eip -- manage AWS elastic IP's
* cloud:rax_clb_nodes -- manage Rackspace cloud load balancers * cloud:rax_clb_nodes -- manage Rackspace cloud load balancers
* system: firewalld -- manage the firewalld configuration * system: firewalld -- manage the firewalld configuration
* system: host -- manage host file entries and aliases
* system: modprobe -- manage kernel modules on systems that support modprobe/rmmod * system: modprobe -- manage kernel modules on systems that support modprobe/rmmod
Misc changes: Misc changes:

11
library/system/host
View file

@ -50,11 +50,10 @@ options:
EXAMPLES = ''' EXAMPLES = '''
# Example host command from Ansible Playbooks # Example host command from Ansible Playbooks
- host: ip=127.0.0.1 hostname=localhost aliases=foobar.com,localhost.foobar.com
- host: ip=127.0.0.1 hostname=localhost state=present - host: ip=127.0.0.1 hostname=localhost state=present
- host: ip=127.0.0.1 hostname=localhost aliases=foobar.com,localhost.foobar.com
- host: ip=192.168.1.1 state=absent - host: ip=192.168.1.1 state=absent
- host: hostname=localhost state=absent - host: ip=::1 hostname=localhost6 aliases=ip6-localhost,ip6-loopback
- host: ip=::1 hostname=localhost aliases=ip6-localhost,ip6-loopback
''' '''
import os import os
@ -126,10 +125,10 @@ class Host(object):
def full_entry_exists(self): def full_entry_exists(self):
if self._has_aliases and not self._aliases_matches: if self._has_aliases and not self._aliases_matches:
return False return False
return self._ip_matches and self.hostname_matches return self._ip_matches and self._hostname_matches
def entry_exists(self): def entry_exists(self):
return self._ip_matches or self.hostname_matches return self._ip_matches or self._hostname_matches
def remove_entry(self): def remove_entry(self):
self._hostsfile_lines.pop(self._found_on_line) self._hostsfile_lines.pop(self._found_on_line)
@ -165,7 +164,7 @@ def main():
result = {} result = {}
host = Host(module) host = Host(module)
result['state'] = host.state result['state'] = host.state
result['changed'] = false result['changed'] = False
err = host.validate_has_hostname_on_present() err = host.validate_has_hostname_on_present()
if err: if err: