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

Merge pull request #12918 from Dwaligon/devel

Browse source 
Fxing typo
This commit is contained in:
Brian Coca 2015-10-26 17:16:16 -04:00
commit 1baa9831df
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/inventory/openvz.py
View file

@ -24,7 +24,7 @@
# https://github.com/ansible/ansible/blob/e5ef0eca03cbb6c8950c06dc50d0ca22aa8902f4/plugins/inventory/libvirt_lxc.py # https://github.com/ansible/ansible/blob/e5ef0eca03cbb6c8950c06dc50d0ca22aa8902f4/plugins/inventory/libvirt_lxc.py
# #
# Groups are determined by the description field of openvz guests # Groups are determined by the description field of openvz guests
# multiple groups can be seperated by commas: webserver,dbserver # multiple groups can be separated by commas: webserver,dbserver
from subprocess import Popen,PIPE from subprocess import Popen,PIPE
import sys import sys

2
lib/ansible/plugins/action/__init__.py
View file

@ -154,7 +154,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
continue continue
if not isinstance(environment, dict): if not isinstance(environment, dict):
raise AnsibleError("environment must be a dictionary, received %s (%s)" % (environment, type(environment))) raise AnsibleError("environment must be a dictionary, received %s (%s)" % (environment, type(environment)))
# very deliberatly using update here instead of combine_vars, as # very deliberately using update here instead of combine_vars, as
# these environment settings should not need to merge sub-dicts # these environment settings should not need to merge sub-dicts
final_environment.update(environment) final_environment.update(environment)

2
lib/ansible/plugins/action/synchronize.py
View file

@ -146,7 +146,7 @@ class ActionModule(ActionBase):
use_delegate = False use_delegate = False
if dest_host == delegate_to: if dest_host == delegate_to:
# edge case: explicit delegate and dest_host are the same # edge case: explicit delegate and dest_host are the same
# so we run rsync on the remote machine targetting its localhost # so we run rsync on the remote machine targeting its localhost
# (itself) # (itself)
dest_host = '127.0.0.1' dest_host = '127.0.0.1'
use_delegate = True use_delegate = True

2
lib/ansible/plugins/connection/__init__.py
View file

@ -177,7 +177,7 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
Setting this up is performed by the action plugin prior to running Setting this up is performed by the action plugin prior to running
``exec_command``. So we just get passed :param:`cmd` which has the ``exec_command``. So we just get passed :param:`cmd` which has the
BecomeCommand already added. (Examples: sudo, su) BecomeCommand already added. (Examples: sudo, su)
:Command: Is the command we're actualy trying to run remotely. :Command: Is the command we're actually trying to run remotely.
(Examples: mkdir -p $HOME/.ansible, python $HOME/.ansible/tmp-script-file) (Examples: mkdir -p $HOME/.ansible, python $HOME/.ansible/tmp-script-file)
""" """
pass pass