summaryrefslogtreecommitdiff
path: root/lib/ansible/executor
diff options
context:
space:
mode:
authorSandra McCann <samccann@redhat.com>2022-10-25 16:36:03 -0400
committerGitHub <noreply@github.com>2022-10-25 15:36:03 -0500
commit795ac8993b35edc208e33b8033b382cfe240dfee (patch)
treea2c354a348596d96c6f075270fd85aa007ab2516 /lib/ansible/executor
parenta76163ca3c42b32adcd613a1a1d343320bd30fa4 (diff)
downloadansible-795ac8993b35edc208e33b8033b382cfe240dfee.tar.gz
Backportapalooza 10 20 (#79180)
* docs: fix typos (#79082) (cherry picked from commit ad5d9843d651dd35287e2ad1ed0f57439e864e7e) * Docs: syntax error in Parsing semi-structured text with Ansible (#79085) (cherry picked from commit 7d6984618da4c481b2980c1fe4b5b0fa95ae50da) * Added code-block wrappers in implicit_localhost.rst (#79086) Fixes #79031 (cherry picked from commit 8ecfb7c6d8384365cf34c893f6e6faad421f3bc3) * Misc Typo fixes (#79088) (cherry picked from commit a48c4422759605a95e74d0a7e8456ad35f72caa8) * Add code-block wrappers to code examples in playbooks_filters.rst (#79093) Fixes #79029 (cherry picked from commit dfef3260a52a0d1038ed0c6840a5d40a4dbfeeb3) * Apply minor formatting changes to "playbooks directory" section (#79092) (cherry picked from commit 1286b7d42ee9053fa016812eddce40ce40978581) * Made changes to notes on #L9 and #L21 (#79173) (cherry picked from commit d6c268378f248c5892298627ad74562593c6300b) * Update communication.rst (#79172) grammar fixes (cherry picked from commit 1a6cfa8203e932019d1e7eb1d2485f1fe15c7f2c) * Update contributor_path.rst (#79170) grammar fixes (cherry picked from commit 64d5c6cc3af4aa3e39648442e5ed1823543452dc) * Update overview_architecture.rst (#79161) Add missing right parenthesis (cherry picked from commit 89af4e6e31f83f2f51a6e7eeedafcf1b4c2d7b5f) * Added the emphasize changelog (#79160) Co-authored-by: Sviatoslav Sydorenko <wk.cvs.github@sydorenko.org.ua> (cherry picked from commit b7eb0670907637ab2a9c0f40dfe5dc46eb7efbe0) * minor changes in documentation (#79114) (cherry picked from commit cc3abae532ac9d4638bc2299cfc61dd1426658f3) * Setting indentation correctly in the Example section (#79072) (cherry picked from commit 1182059d462c98d908cd0caaedd209aff6acc3a6) * docs: cgroupsv1 is required for ansible-test with docker (#79066) (cherry picked from commit ae38628404598832c5e652ec805e89a62c24e2c4) * Change occurance yes/no to true/false (#79035) (cherry picked from commit 551f5a375327347b26d352c3cbbc93afc93a2402) Co-authored-by: KIDANI Akito <a.kid.1985@gmail.com> Co-authored-by: taso <74918216+tasoint@users.noreply.github.com> Co-authored-by: 12-malak <73274076+12-malak@users.noreply.github.com> Co-authored-by: Abhijeet Kasurde <akasurde@redhat.com> Co-authored-by: Sharif Nassar <mrwacky42@users.noreply.github.com> Co-authored-by: NitrogenPointBlue <110332643+NitrogenPointBlue@users.noreply.github.com> Co-authored-by: Aysha Muhammed <64032658+Aysha-py@users.noreply.github.com> Co-authored-by: Goodness Chris-Ugari <goodnesschrisugari@yahoo.com> Co-authored-by: Jack Lin <46962923+blueskyson@users.noreply.github.com> Co-authored-by: Tabah Baridule M <dulemartins07@gmail.com> Co-authored-by: trolzen <trolzen@gmail.com> Co-authored-by: Bart Dorlandt <bart@bamweb.nl> Co-authored-by: Chris Smart <distroguy@gmail.com>
Diffstat (limited to 'lib/ansible/executor')
-rw-r--r--lib/ansible/executor/task_executor.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py
index 6718f31085..1f35031f8c 100644
--- a/lib/ansible/executor/task_executor.py
+++ b/lib/ansible/executor/task_executor.py
@@ -556,7 +556,7 @@ class TaskExecutor:
plugin_vars = self._set_connection_options(cvars, templar)
# make a copy of the job vars here, as we update them here and later,
- # but don't want to polute original
+ # but don't want to pollute original
vars_copy = variables.copy()
# update with connection info (i.e ansible_host/ansible_user)
self._connection.update_vars(vars_copy)
@@ -578,7 +578,7 @@ class TaskExecutor:
setattr(self._connection, '_socket_path', socket_path)
# TODO: eventually remove this block as this should be a 'consequence' of 'forced_local' modules
- # special handling for python interpreter for network_os, default to ansible python unless overriden
+ # special handling for python interpreter for network_os, default to ansible python unless overridden
if 'ansible_network_os' in cvars and 'ansible_python_interpreter' not in cvars:
# this also avoids 'python discovery'
cvars['ansible_python_interpreter'] = sys.executable
@@ -802,7 +802,7 @@ class TaskExecutor:
# add the delegated vars to the result, so we can reference them
# on the results side without having to do any further templating
- # also now add conneciton vars results when delegating
+ # also now add connection vars results when delegating
if self._task.delegate_to:
result["_ansible_delegated_vars"] = {'ansible_delegated_host': self._task.delegate_to}
for k in plugin_vars: