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

Some minor from 'pep8', and silencing the PEP8 messages I don't care about.

Browse source 
Also make pep8 show all messages rather than just 1 per code.
This commit is contained in:
Michael DeHaan 2012-03-02 22:03:03 -05:00
parent 0d7a84d591
commit 3ad9db4966
5 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -17,11 +17,14 @@ manuals: $(MANPAGES)
%.5: %.5.asciidoc
$(ASCII2MAN)
loc:
sloccount lib library bin
pep8:
@echo "#############################################"
@echo "# Running PEP8 Compliance Tests"
@echo "#############################################"
pep8 lib/
pep8 -r --ignore=E501,E221,W291,W391,E302,E251,E203,W293,E231,E303,E201,E225 lib/ bin/
clean:
rm -rf build

1
lib/ansible/__init__.py
View file

@ -14,4 +14,3 @@
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.

32
lib/ansible/playbook.py
View file

@ -25,7 +25,8 @@ import shlex
# duplicating these
class PlayBook(object):
'''
'''
runs an ansible playbook, given as a datastructure
or YAML filename. a playbook is a deployment, config
management, or automation based set of commands to
@ -36,7 +37,7 @@ class PlayBook(object):
according to the number of forks requested.
'''
def __init__(self,
def __init__(self,
playbook =None,
host_list =C.DEFAULT_HOST_LIST,
module_path =C.DEFAULT_MODULE_PATH,
@ -92,13 +93,13 @@ class PlayBook(object):
'changed' : self.changed.get(host, 0),
'dark' : self.dark.get(host, 0),
'failed' : self.failures.get(host, 0)
}
}
return results
def _prune_failed_hosts(self, host_list):
new_hosts = []
for x in host_list:
if not self.failures.has_key(x) and not self.dark.has_key(x):
if not x in self.failures and not x in self.dark:
new_hosts.append(x)
return new_hosts
@ -116,9 +117,9 @@ class PlayBook(object):
remote_user=remote_user
).run()
def _run_task(self, pattern=None, task=None, host_list=None,
def _run_task(self, pattern=None, task=None, host_list=None,
remote_user=None, handlers=None, conditional=False):
'''
'''
run a single task in the playbook and
recursively run any subtasks.
'''
@ -152,7 +153,8 @@ class PlayBook(object):
# load up an appropriate ansible runner to
# run the task in parallel
results = self._run_module(pattern, module_name, module_args, host_list, remote_user)
results = self._run_module(pattern, module_name,
module_args, host_list, remote_user)
# if no hosts are matched, carry on, unlike /bin/ansible
# which would warn you about this
@ -171,7 +173,7 @@ class PlayBook(object):
self.processed[host] = 1
if self.verbose:
print "unreachable: [%s] => %s" % (host, msg)
if not self.dark.has_key(host):
if not host in self.dark:
self.dark[host] = 1
else:
self.dark[host] = self.dark[host] + 1
@ -182,19 +184,19 @@ class PlayBook(object):
if is_failed(results):
if self.verbose:
print "failed: [%s] => %s\n" % (host, smjson(results))
if not self.failures.has_key(host):
if not host in self.failures:
self.failures[host] = 1
else:
self.failures[host] = self.failures[host] + 1
else:
if self.verbose:
print "ok: [%s]\n" % host
if not self.invocations.has_key(host):
if not host in self.invocations:
self.invocations[host] = 1
else:
self.invocations[host] = self.invocations[host] + 1
if results.get('changed', False):
if not self.changed.has_key(host):
if not host in self.changed:
self.changed[host] = 1
else:
self.changed[host] = self.changed[host] + 1
@ -209,7 +211,7 @@ class PlayBook(object):
for host, results in contacted.items():
if results.get('changed', False):
for subtask in subtasks:
self._flag_handler(handlers, subtask, host)
self._flag_handler(handlers, subtask, host)
def _flag_handler(self, handlers, match_name, host):
'''
@ -227,7 +229,7 @@ class PlayBook(object):
if match_name == name:
# flag the handler with the list of hosts
# it needs to be run on, it will be run later
if not x.has_key("run"):
if not run in x:
x['run'] = []
x['run'].append(host)
@ -246,7 +248,7 @@ class PlayBook(object):
self.host_list, groups = ansible.runner.Runner.parse_hosts(host_file)
if self.verbose:
print "PLAY [%s] ****************************************\n" % pattern
print "PLAY [%s] ****************************\n" % pattern
# run all the top level tasks, these get run on every node
@ -268,7 +270,7 @@ class PlayBook(object):
if type(task.get("run", None)) == list:
self._run_task(
pattern=pattern,
task=task,
task=task,
handlers=handlers,
host_list=task.get('run',[]),
conditional=True,

12
lib/ansible/runner.py
View file

@ -16,6 +16,8 @@
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
#
################################################
try:
import json
except ImportError:
@ -26,9 +28,11 @@ import multiprocessing
import signal
import os
import traceback
import paramiko # non-core dependency
import ansible.constants as C
import Queue
import paramiko
################################################
def _executor_hook(job_queue, result_queue):
''' callback used by multiprocessing pool '''
@ -126,7 +130,7 @@ class Runner(object):
if fnmatch.fnmatch(host_name, subpattern):
return True
# or it could be a literal group name instead
if self.groups.has_key(subpattern):
if subpattern in self.groups:
if host_name in self.groups[subpattern]:
return True
return False
@ -203,8 +207,8 @@ class Runner(object):
options = {}
for x in args:
if x.find("=") != -1:
k, v = x.split("=")
options[k]=v
k, v = x.split("=")
options[k]=v
return options
def _execute_copy(self, conn, host):

6
lib/ansible/utils.py
View file

@ -74,11 +74,11 @@ def command_generic_msg(hostname, result, oneline, caption):
if not oneline:
buf = "%s | %s | rc=%s >>\n" % (hostname, caption, result.get('rc',0))
if stdout:
buf += stdout
buf += stdout
if stderr:
buf += stderr
buf += stderr
if msg:
buf += msg
buf += msg
return buf
else:
if stderr: