just a few spelling error changes
This commit is contained in:
parent
4205d74b11
commit
cfbfd38723
32 changed files with 38 additions and 38 deletions
|
@ -138,7 +138,7 @@ Other Notable Changes:
|
|||
Operations that depend on a clean working tree may fail unless force=yes is
|
||||
added.
|
||||
* git: When local modifications exist in a checkout, the git module will now
|
||||
fail unless force is explictly specified. Specifying force=yes will allow
|
||||
fail unless force is explicitly specified. Specifying force=yes will allow
|
||||
the module to revert and overwrite local modifications to make git actions
|
||||
succeed.
|
||||
* hg: When local modifications exist in a checkout, the hg module used to
|
||||
|
|
|
@ -183,7 +183,7 @@ to the `module development documentation <http://docs.ansible.com/developing_mod
|
|||
Ansible's aesthetic encourages simple, readable code and consistent, conservatively extending,
|
||||
backwards-compatible improvements. Code developed for Ansible needs to support Python 2.6+,
|
||||
while code in modules must run under Python 2.4 or higher. Please also use a 4-space indent
|
||||
and no tabs, we do not enforce 80 column lines, we are fine wtih 120-140. We do not take 'style only'
|
||||
and no tabs, we do not enforce 80 column lines, we are fine with 120-140. We do not take 'style only'
|
||||
requests unless the code is nearly unreadable, we are "PEP8ish", but not strictly compliant.
|
||||
|
||||
You can also contribute by testing and revising other requests, specially if it is one you are interested
|
||||
|
|
|
@ -277,7 +277,7 @@ Get a string checksum::
|
|||
|
||||
{{ 'test2'|checksum }}
|
||||
|
||||
Other hashes (platform dependant)::
|
||||
Other hashes (platform dependent)::
|
||||
|
||||
{{ 'test2'|hash('blowfish') }}
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class UnclosedQuoteError(SQLParseError):
|
|||
pass
|
||||
|
||||
# maps a type of identifier to the maximum number of dot levels that are
|
||||
# allowed to specifiy that identifier. For example, a database column can be
|
||||
# allowed to specify that identifier. For example, a database column can be
|
||||
# specified by up to 4 levels: database.schema.table.column
|
||||
_PG_IDENTIFIER_TO_DOT_LEVEL = dict(database=1, schema=2, table=3, column=4, role=1)
|
||||
_MYSQL_IDENTIFIER_TO_DOT_LEVEL = dict(database=1, table=2, column=3, role=1, vars=1)
|
||||
|
|
|
@ -1494,7 +1494,7 @@ class AIX(Hardware):
|
|||
|
||||
class HPUX(Hardware):
|
||||
"""
|
||||
HP-UX-specifig subclass of Hardware. Defines memory and CPU facts:
|
||||
HP-UX-specific subclass of Hardware. Defines memory and CPU facts:
|
||||
- memfree_mb
|
||||
- memtotal_mb
|
||||
- swapfree_mb
|
||||
|
@ -2062,7 +2062,7 @@ class GenericBsdIfconfigNetwork(Network):
|
|||
current_if['options'] = self.get_options(words[0])
|
||||
|
||||
def parse_nd6_line(self, words, current_if, ips):
|
||||
# FreBSD has options like this...
|
||||
# FreeBSD has options like this...
|
||||
current_if['options'] = self.get_options(words[1])
|
||||
|
||||
def parse_ether_line(self, words, current_if, ips):
|
||||
|
@ -2642,7 +2642,7 @@ class SunOSVirtual(Virtual):
|
|||
rc, out, err = module.run_command("/usr/sbin/virtinfo -p")
|
||||
# The output contains multiple lines with different keys like this:
|
||||
# DOMAINROLE|impl=LDoms|control=false|io=false|service=false|root=false
|
||||
# The output may also be not formated and the returncode is set to 0 regardless of the error condition:
|
||||
# The output may also be not formatted and the returncode is set to 0 regardless of the error condition:
|
||||
# virtinfo can only be run from the global zone
|
||||
try:
|
||||
for line in out.split('\n'):
|
||||
|
|
|
@ -76,7 +76,7 @@ class PlayBook(object):
|
|||
any_errors_fatal = False,
|
||||
vault_password = False,
|
||||
force_handlers = False,
|
||||
# privelege escalation
|
||||
# privilege escalation
|
||||
become = C.DEFAULT_BECOME,
|
||||
become_method = C.DEFAULT_BECOME_METHOD,
|
||||
become_user = C.DEFAULT_BECOME_USER,
|
||||
|
|
|
@ -156,7 +156,7 @@ class Play(object):
|
|||
self.no_log = utils.boolean(ds.get('no_log', 'false'))
|
||||
self.force_handlers = utils.boolean(ds.get('force_handlers', self.playbook.force_handlers))
|
||||
|
||||
# Fail out if user specifies conflicting privelege escalations
|
||||
# Fail out if user specifies conflicting privilege escalations
|
||||
if (ds.get('become') or ds.get('become_user')) and (ds.get('sudo') or ds.get('sudo_user')):
|
||||
raise errors.AnsibleError('sudo params ("become", "become_user") and su params ("sudo", "sudo_user") cannot be used together')
|
||||
if (ds.get('become') or ds.get('become_user')) and (ds.get('su') or ds.get('su_user')):
|
||||
|
|
|
@ -152,7 +152,7 @@ class Runner(object):
|
|||
run_hosts=None, # an optional list of pre-calculated hosts to run on
|
||||
no_log=False, # option to enable/disable logging for a given task
|
||||
run_once=False, # option to enable/disable host bypass loop for a given task
|
||||
become=False, # whether to run privelege escalation or not
|
||||
become=False, # whether to run privilege escalation or not
|
||||
become_method=C.DEFAULT_BECOME_METHOD,
|
||||
become_user=C.DEFAULT_BECOME_USER, # ex: 'root'
|
||||
become_pass=C.DEFAULT_BECOME_PASS, # ex: 'password123' or None
|
||||
|
|
|
@ -76,7 +76,7 @@ class Connection(object):
|
|||
if in_data:
|
||||
raise errors.AnsibleError("Internal Error: this module does not support optimized module pipelining")
|
||||
|
||||
# We ignore privelege escalation!
|
||||
# We ignore privilege escalation!
|
||||
local_cmd = self._generate_cmd(executable, cmd)
|
||||
|
||||
vvv("EXEC %s" % (local_cmd), host=self.lxc)
|
||||
|
|
|
@ -109,7 +109,7 @@ class Connection(object):
|
|||
if in_data:
|
||||
raise errors.AnsibleError("Internal Error: this module does not support optimized module pipelining")
|
||||
|
||||
# We happily ignore privelege escalation
|
||||
# We happily ignore privilege escalation
|
||||
if executable == '/bin/sh':
|
||||
executable = None
|
||||
local_cmd = self._generate_cmd(executable, cmd)
|
||||
|
|
|
@ -39,7 +39,7 @@ class LookupModule(object):
|
|||
utils.warnings("Failed lookup url for %s : %s" % (term, str(e)))
|
||||
continue
|
||||
except HTTPError, e:
|
||||
utils.warnings("Recieved HTTP error for %s : %s" % (term, str(e)))
|
||||
utils.warnings("Received HTTP error for %s : %s" % (term, str(e)))
|
||||
continue
|
||||
|
||||
for line in response.read().splitlines():
|
||||
|
|
|
@ -336,7 +336,7 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
|
|||
data = unicode(data, 'utf-8')
|
||||
|
||||
# Check to see if the string we are trying to render is just referencing a single
|
||||
# var. In this case we don't wont to accidentally change the type of the variable
|
||||
# var. In this case we don't want to accidentally change the type of the variable
|
||||
# to a string by using the jinja template renderer. We just want to pass it.
|
||||
only_one = SINGLE_VAR.match(data)
|
||||
if only_one:
|
||||
|
|
|
@ -41,7 +41,7 @@ that will be used instead of the configured values if they are set:
|
|||
If errors are encountered during operation, this script will return an exit code of
|
||||
255; otherwise, it will return an exit code of 0.
|
||||
|
||||
Collins attributes are accessable as variables in ansible via the COLLINS['attribute_name'].
|
||||
Collins attributes are accessible as variables in ansible via the COLLINS['attribute_name'].
|
||||
|
||||
Tested against Ansible 1.8.2 and Collins 1.3.0.
|
||||
"""
|
||||
|
|
|
@ -211,7 +211,7 @@ class ConsulInventory(object):
|
|||
|
||||
def load_data_for_node(self, node, datacenter):
|
||||
'''loads the data for a sinle node adding it to various groups based on
|
||||
metadata retrieved from the kv store and service availablity'''
|
||||
metadata retrieved from the kv store and service availability'''
|
||||
|
||||
index, node_data = self.consul_api.catalog.node(node, dc=datacenter)
|
||||
node = node_data['Node']
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this software. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
# The OpenStack Inventory module uses os-client-config for configuation.
|
||||
# The OpenStack Inventory module uses os-client-config for configuration.
|
||||
# https://github.com/stackforge/os-client-config
|
||||
# This means it will either:
|
||||
# - Respect normal OS_* environment variables like other OpenStack tools
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
# __Test Outline__
|
||||
#
|
||||
# __ec2_elb_lb__
|
||||
# create test elb with listeners and certificat
|
||||
# create test elb with listeners and certificate
|
||||
# change AZ's
|
||||
# change listeners
|
||||
# remove listeners
|
||||
|
|
|
@ -601,7 +601,7 @@
|
|||
- rax_clb_a1.balancer.algorithm == 'LEAST_CONNECTIONS'
|
||||
- rax_clb_a1.balancer.status == 'ACTIVE'
|
||||
|
||||
- name: Test rax_clb with updated algoritm 2
|
||||
- name: Test rax_clb with updated algorithm 2
|
||||
rax_clb:
|
||||
username: "{{ rackspace_username }}"
|
||||
api_key: "{{ rackspace_api_key }}"
|
||||
|
|
|
@ -4,7 +4,7 @@ This comes from host, not the parents or grandparents.
|
|||
The value of the grandparent variable grandparent_var is
|
||||
not overridden and is = 2000
|
||||
|
||||
The value of the parent variable is not overriden and
|
||||
The value of the parent variable is not overridden and
|
||||
is = 6000
|
||||
|
||||
The variable 'overridden_in_parent' is set in the parent
|
||||
|
|
|
@ -4,7 +4,7 @@ This comes from host, not the parents or grandparents.
|
|||
The value of the grandparent variable grandparent_var is
|
||||
not overridden and is = {{ grandparent_var }}
|
||||
|
||||
The value of the parent variable is not overriden and
|
||||
The value of the parent variable is not overridden and
|
||||
is = {{ parent_var }}
|
||||
|
||||
The variable 'overridden_in_parent' is set in the parent
|
||||
|
|
|
@ -116,7 +116,7 @@ class TaskQueueManager:
|
|||
for handler in handler_block.block:
|
||||
handler_list.append(handler)
|
||||
|
||||
# then initalize it with the handler names from the handler list
|
||||
# then initialize it with the handler names from the handler list
|
||||
for handler in handler_list:
|
||||
self._notified_handlers[handler.get_name()] = []
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class UnclosedQuoteError(SQLParseError):
|
|||
pass
|
||||
|
||||
# maps a type of identifier to the maximum number of dot levels that are
|
||||
# allowed to specifiy that identifier. For example, a database column can be
|
||||
# allowed to specify that identifier. For example, a database column can be
|
||||
# specified by up to 4 levels: database.schema.table.column
|
||||
_PG_IDENTIFIER_TO_DOT_LEVEL = dict(database=1, schema=2, table=3, column=4, role=1)
|
||||
_MYSQL_IDENTIFIER_TO_DOT_LEVEL = dict(database=1, table=2, column=3, role=1, vars=1)
|
||||
|
|
|
@ -1494,7 +1494,7 @@ class AIX(Hardware):
|
|||
|
||||
class HPUX(Hardware):
|
||||
"""
|
||||
HP-UX-specifig subclass of Hardware. Defines memory and CPU facts:
|
||||
HP-UX-specific subclass of Hardware. Defines memory and CPU facts:
|
||||
- memfree_mb
|
||||
- memtotal_mb
|
||||
- swapfree_mb
|
||||
|
@ -2062,7 +2062,7 @@ class GenericBsdIfconfigNetwork(Network):
|
|||
current_if['options'] = self.get_options(words[0])
|
||||
|
||||
def parse_nd6_line(self, words, current_if, ips):
|
||||
# FreBSD has options like this...
|
||||
# FreeBSD has options like this...
|
||||
current_if['options'] = self.get_options(words[1])
|
||||
|
||||
def parse_ether_line(self, words, current_if, ips):
|
||||
|
@ -2642,7 +2642,7 @@ class SunOSVirtual(Virtual):
|
|||
rc, out, err = module.run_command("/usr/sbin/virtinfo -p")
|
||||
# The output contains multiple lines with different keys like this:
|
||||
# DOMAINROLE|impl=LDoms|control=false|io=false|service=false|root=false
|
||||
# The output may also be not formated and the returncode is set to 0 regardless of the error condition:
|
||||
# The output may also be not formatted and the returncode is set to 0 regardless of the error condition:
|
||||
# virtinfo can only be run from the global zone
|
||||
try:
|
||||
for line in out.split('\n'):
|
||||
|
|
|
@ -149,12 +149,12 @@ class DataLoader():
|
|||
show_content = False
|
||||
return (data, show_content)
|
||||
except (IOError, OSError) as e:
|
||||
raise AnsibleParserError("an error occured while trying to read the file '%s': %s" % (file_name, str(e)))
|
||||
raise AnsibleParserError("an error occurred while trying to read the file '%s': %s" % (file_name, str(e)))
|
||||
|
||||
def _handle_error(self, yaml_exc, file_name, show_content):
|
||||
'''
|
||||
Optionally constructs an object (AnsibleBaseYAMLObject) to encapsulate the
|
||||
file name/position where a YAML exception occured, and raises an AnsibleParserError
|
||||
file name/position where a YAML exception occurred, and raises an AnsibleParserError
|
||||
to display the syntax exception information.
|
||||
'''
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ class ModuleArgsParser:
|
|||
dest: b
|
||||
|
||||
# extra gross, but also legal. in this case, the args specified
|
||||
# will act as 'defaults' and will be overriden by any args specified
|
||||
# will act as 'defaults' and will be overridden by any args specified
|
||||
# in one of the other formats (complex args under the action, or
|
||||
# parsed from the k=v string
|
||||
- command: 'pwd'
|
||||
|
|
|
@ -37,7 +37,7 @@ class Become:
|
|||
|
||||
def _detect_privilege_escalation_conflict(self, ds):
|
||||
|
||||
# Fail out if user specifies conflicting privelege escalations
|
||||
# Fail out if user specifies conflicting privilege escalations
|
||||
has_become = 'become' in ds or 'become_user'in ds
|
||||
has_sudo = 'sudo' in ds or 'sudo_user' in ds
|
||||
has_su = 'su' in ds or 'su_user' in ds
|
||||
|
|
|
@ -354,9 +354,9 @@ class ActionBase:
|
|||
# FIXME: async stuff here?
|
||||
#if (module_style != 'new' or async_jid is not None or not self._connection._has_pipelining or not C.ANSIBLE_SSH_PIPELINING or C.DEFAULT_KEEP_REMOTE_FILES):
|
||||
if remote_module_path:
|
||||
debug("transfering module to remote")
|
||||
debug("transferring module to remote")
|
||||
self._transfer_data(remote_module_path, module_data)
|
||||
debug("done transfering module to remote")
|
||||
debug("done transferring module to remote")
|
||||
|
||||
environment_string = self._compute_environment_string()
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ class ActionModule(ActionBase):
|
|||
if src is None:
|
||||
return dict(failed=True, msg="src is required")
|
||||
elif remote_src:
|
||||
# everyting is remote, so we just execute the module
|
||||
# everything is remote, so we just execute the module
|
||||
# without changing any of the module arguments
|
||||
return self._execute_module()
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ class Connection(object):
|
|||
if in_data:
|
||||
raise errors.AnsibleError("Internal Error: this module does not support optimized module pipelining")
|
||||
|
||||
# We ignore privelege escalation!
|
||||
# We ignore privilege escalation!
|
||||
local_cmd = self._generate_cmd(executable, cmd)
|
||||
|
||||
vvv("EXEC %s" % (local_cmd), host=self.lxc)
|
||||
|
|
|
@ -111,7 +111,7 @@ class Connection(object):
|
|||
if in_data:
|
||||
raise errors.AnsibleError("Internal Error: this module does not support optimized module pipelining")
|
||||
|
||||
# We happily ignore privelege escalation
|
||||
# We happily ignore privilege escalation
|
||||
if executable == '/bin/sh':
|
||||
executable = None
|
||||
local_cmd = self._generate_cmd(executable, cmd)
|
||||
|
|
|
@ -37,7 +37,7 @@ class LookupModule(LookupBase):
|
|||
utils.warnings("Failed lookup url for %s : %s" % (term, str(e)))
|
||||
continue
|
||||
except HTTPError as e:
|
||||
utils.warnings("Recieved HTTP error for %s : %s" % (term, str(e)))
|
||||
utils.warnings("Received HTTP error for %s : %s" % (term, str(e)))
|
||||
continue
|
||||
|
||||
for line in response.read().splitlines():
|
||||
|
|
|
@ -138,7 +138,7 @@ class Templar:
|
|||
if self._contains_vars(variable):
|
||||
|
||||
# Check to see if the string we are trying to render is just referencing a single
|
||||
# var. In this case we don't wont to accidentally change the type of the variable
|
||||
# var. In this case we don't want to accidentally change the type of the variable
|
||||
# to a string by using the jinja template renderer. We just want to pass it.
|
||||
only_one = SINGLE_VAR.match(variable)
|
||||
if only_one:
|
||||
|
|
|
@ -384,7 +384,7 @@ def process_category(category, categories, options, env, template, outputname):
|
|||
category_file.write("""\n\n
|
||||
.. note::
|
||||
- %s: This marks a module as deprecated, which means a module is kept for backwards compatibility but usage is discouraged. The module documentation details page may explain more about this rationale.
|
||||
- %s: This marks a module as 'extras', which means it ships with ansible but may be a newer module and possibly (but not neccessarily) less activity maintained than 'core' modules.
|
||||
- %s: This marks a module as 'extras', which means it ships with ansible but may be a newer module and possibly (but not necessarily) less activity maintained than 'core' modules.
|
||||
- Tickets filed on modules are filed to different repos than those on the main open source project. Core module tickets should be filed at `ansible/ansible-modules-core on GitHub <http://github.com/ansible/ansible-modules-core>`_, extras tickets to `ansible/ansible-modules-extras on GitHub <http://github.com/ansible/ansible-modules-extras>`_
|
||||
""" % (DEPRECATED, NOTCORE))
|
||||
category_file.close()
|
||||
|
|
Loading…
Reference in a new issue