Add ansible command, fix import error in runner

This commit is contained in:
Michael DeHaan 2012-02-28 00:45:37 -05:00
parent 0321afb1e3
commit 7de661dd2c
3 changed files with 58 additions and 0 deletions

52
bin/ans-playbook Executable file
View file

@ -0,0 +1,52 @@
#!/usr/bin/python -tt
# (C) 2012, Michael DeHaan, <michael.dehaan@gmail.com>
# This file is part of Ansible
#
# Ansible is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# Ansible is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
#
import sys
import ansible.playbook
from ansible.scripts import base_ans_parser, error_print
def main(args):
parser = base_ans_parser(output_path=False)
parser.usage = "ans-playbook playbook.yml"
options, args = parser.parse_args(args)
if len(args) == 0:
print >> sys.stderr, "playbook path is a required argument"
return 1
for playbook in args:
pb = ansible.playbook.PlayBook(
playbook=playbook,
module_path=options.module_path,
remote_user=options.remote_user,
forks=options.forks,
verbose=True
)
pb.run()
return 0
if __name__ == "__main__":
sys.exit(main(sys.argv[1:]))

View file

@ -24,6 +24,7 @@ import json
import traceback import traceback
import paramiko # non-core dependency import paramiko # non-core dependency
import ansible.constants as C import ansible.constants as C
import Queue
def _executor_hook(job_queue, result_queue): def _executor_hook(job_queue, result_queue):
''' callback used by multiprocessing pool ''' ''' callback used by multiprocessing pool '''

View file

@ -51,6 +51,11 @@ except:
endd = datetime.datetime.now() endd = datetime.datetime.now()
delta = endd - startd delta = endd - startd
if out is None:
out = ''
if err is None:
err = ''
result = { result = {
"stdout" : out, "stdout" : out,
"stderr" : err, "stderr" : err,