From 35fdae7485e245fa7dbc0f5330c32f51c71724d1 Mon Sep 17 00:00:00 2001 From: Lars Kellogg-Stedman Date: Wed, 24 Apr 2019 01:06:09 -0400 Subject: [PATCH] spelling: temaplte -> template (#55665) Correct a common mis-spelling of 'template' including in the return value of the lib/ansible/modules/cloud/cloudstack/cs_template.py module. --- lib/ansible/executor/task_executor.py | 2 +- lib/ansible/modules/cloud/cloudstack/cs_template.py | 2 +- test/integration/targets/conditionals/play.yml | 2 +- .../vault/roles/test_vaulted_template/tasks/main.yml | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 40f0d62fc1d..566030a4984 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -299,7 +299,7 @@ class TaskExecutor: loop_pause = templar.template(self._task.loop_control.pause) extended = templar.template(self._task.loop_control.extended) - # This may be 'None',so it is tempalted below after we ensure a value and an item is assigned + # This may be 'None',so it is templated below after we ensure a value and an item is assigned label = self._task.loop_control.label # ensure we always have a label diff --git a/lib/ansible/modules/cloud/cloudstack/cs_template.py b/lib/ansible/modules/cloud/cloudstack/cs_template.py index 19fcc9d75b5..9e2ddf75a26 100644 --- a/lib/ansible/modules/cloud/cloudstack/cs_template.py +++ b/lib/ansible/modules/cloud/cloudstack/cs_template.py @@ -396,7 +396,7 @@ class AnsibleCloudStackTemplate(AnsibleCloudStack): 'templatetag': 'template_tag', 'sshkeyenabled': 'sshkey_enabled', 'passwordenabled': 'password_enabled', - 'tempaltetype': 'template_type', + 'templatetype': 'template_type', 'ostypename': 'os_type', 'crossZones': 'cross_zones', 'format': 'format', diff --git a/test/integration/targets/conditionals/play.yml b/test/integration/targets/conditionals/play.yml index 10b24589a0f..c6bb381527b 100644 --- a/test/integration/targets/conditionals/play.yml +++ b/test/integration/targets/conditionals/play.yml @@ -206,7 +206,7 @@ when: bare|bool - - name: assert that the bad nested conditional did run since non bare 'string' is untempalted but 'trueish' + - name: assert that the bad nested conditional did run since non bare 'string' is untemplated but 'trueish' assert: that: - result is skipped diff --git a/test/integration/targets/vault/roles/test_vaulted_template/tasks/main.yml b/test/integration/targets/vault/roles/test_vaulted_template/tasks/main.yml index b6e6ce78f10..b4af5efcd03 100644 --- a/test/integration/targets/vault/roles/test_vaulted_template/tasks/main.yml +++ b/test/integration/targets/vault/roles/test_vaulted_template/tasks/main.yml @@ -9,11 +9,11 @@ - name: Get output template contents slurp: path: "{{ output_dir }}/vaulted_template.out" - register: vaulted_tempalte_out + register: vaulted_template_out - debug: - msg: "{{ vaulted_tempalte_out.content|b64decode }}" + msg: "{{ vaulted_template_out.content|b64decode }}" - assert: that: - - vaulted_tempalte_out.content|b64decode == 'here_i_am\n' + - vaulted_template_out.content|b64decode == 'here_i_am\n'