Merge "Drop backwards compatibility for template trusting"

Author: Zuul

kayobe/plugins/action/kolla_ansible_host_vars.py

@@ -13,16 +13,7 @@
 # under the License.
 
 from ansible.plugins.action import ActionBase
-
-# TODO(dougszu): From Ansible 12 onwards we must explicitly trust templates.
-# Since this feature is not supported in previous releases, we define a
-# noop method here for backwards compatibility. This can be removed in the
-# G cycle.
-try:
-    from ansible.template import trust_as_template
-except ImportError:
-    def trust_as_template(template):
-        return template
+from ansible.template import trust_as_template
 
 
 class ConfigError(Exception):

kayobe/plugins/action/merge_configs.py

@@ -24,15 +24,7 @@
 
 from ansible import constants
 from ansible.plugins import action
-# TODO(dougszu): From Ansible 12 onwards we must explicitly trust templates.
-# Since this feature is not supported in previous releases, we define a
-# noop method here for backwards compatibility. This can be removed in the
-# G cycle.
-try:
-    from ansible.template import trust_as_template
-except ImportError:
-    def trust_as_template(template):
-        return template
+from ansible.template import trust_as_template
 
 from io import StringIO
 

kayobe/plugins/action/merge_yaml.py

@@ -27,15 +27,7 @@
 from ansible import errors as ansible_errors
 from ansible.plugins import action
 
-# TODO(dougszu): From Ansible 12 onwards we must explicitly trust templates.
-# Since this feature is not supported in previous releases, we define a
-# noop method here for backwards compatibility. This can be removed in the
-# G cycle.
-try:
-    from ansible.template import trust_as_template
-except ImportError:
-    def trust_as_template(template):
-        return template
+from ansible.template import trust_as_template
 
 DOCUMENTATION = '''
 ---