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

Merge remote branch 'public/integration' into integration

Browse source
This commit is contained in:
Michael DeHaan 2012-04-13 19:33:57 -04:00
commit 347637339c
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/ansible
View file

@ -151,6 +151,8 @@ class Cli(object):
clock = clock - options.poll_interval clock = clock - options.poll_interval
time.sleep(options.poll_interval) time.sleep(options.poll_interval)
poll_hosts = self.hosts_to_poll(poll_results) poll_hosts = self.hosts_to_poll(poll_results)
if len(poll_hosts)==0:
break
######################################################## ########################################################

2
lib/ansible/runner.py
View file

@ -121,7 +121,7 @@ class Runner(object):
euid = pwd.getpwuid(os.geteuid())[0] euid = pwd.getpwuid(os.geteuid())[0]
if self.transport == 'local' and self.remote_user != euid: if self.transport == 'local' and self.remote_user != euid:
raise Exception("User mismatch: expected %s, but is %s" % (self.remote_user, euid)) raise Exception("User mismatch: expected %s, but is %s" % (self.remote_user, euid))
if type(self.module_args) != str and type(self.module_args) != dict: if type(self.module_args) not in [str, unicode, dict]:
raise Exception("module_args must be a string or dict: %s" % self.module_args) raise Exception("module_args must be a string or dict: %s" % self.module_args)
self._tmp_paths = {} self._tmp_paths = {}

4
library/virt
View file

@ -297,7 +297,7 @@ class Virt(object):
""" """
Stop a domain, and then wipe it from the face of the earth. Stop a domain, and then wipe it from the face of the earth.
by deleting the disk image and it's configuration file. by deleting the disk image and its configuration file.
""" """
self.__get_conn() self.__get_conn()
@ -316,7 +316,7 @@ class Virt(object):
def get_xml(self, vmid): def get_xml(self, vmid):
""" """
Recieve a Vm id as input Receive a Vm id as input
Return an xml describing vm config returned by a libvirt call Return an xml describing vm config returned by a libvirt call
""" """
conn = libvirt.openReadOnly(None) conn = libvirt.openReadOnly(None)

2
library/yum
View file

@ -68,7 +68,7 @@ def pkg_to_dict(po):
return d return d
def list_stuff(my, stuff): def list_stuff(my, stuff):
# FIXME - there are poitential tracebacks that could occur here # FIXME - there are potential tracebacks that could occur here
# need some more catching for them so we can see what happened # need some more catching for them so we can see what happened
if stuff == 'installed': if stuff == 'installed':
return [ pkg_to_dict(po) for po in my.rpmdb ] return [ pkg_to_dict(po) for po in my.rpmdb ]