From 0838ee48d27dcfbdb0b4e670fc3dfd9a50c7ae2f Mon Sep 17 00:00:00 2001 From: Mike Graves Date: Wed, 25 Aug 2021 10:37:56 -0400 Subject: [PATCH] Enable turbo mode (#102) * Enable turbo mode This enables turbo mode (default is off) for the modules in this collection that use the client from the kubernetes.core collection. * Add changelog fragment --- changelogs/fragments/102-support-turbo-mode.yaml | 3 +++ plugins/modules/k8s.py | 5 ++++- plugins/modules/openshift_process.py | 8 +++++--- plugins/modules/openshift_route.py | 7 +++++-- 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 changelogs/fragments/102-support-turbo-mode.yaml diff --git a/changelogs/fragments/102-support-turbo-mode.yaml b/changelogs/fragments/102-support-turbo-mode.yaml new file mode 100644 index 0000000..10fe9c2 --- /dev/null +++ b/changelogs/fragments/102-support-turbo-mode.yaml @@ -0,0 +1,3 @@ +--- +minor_changes: + - add support for turbo mode (https://github.com/openshift/community.okd/pull/102). diff --git a/plugins/modules/k8s.py b/plugins/modules/k8s.py index 3ba3fde..17e71d9 100644 --- a/plugins/modules/k8s.py +++ b/plugins/modules/k8s.py @@ -266,7 +266,10 @@ import operator import traceback from functools import reduce -from ansible.module_utils.basic import AnsibleModule +try: + from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import AnsibleModule +except ImportError: + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_native try: diff --git a/plugins/modules/openshift_process.py b/plugins/modules/openshift_process.py index e399eed..bd44327 100644 --- a/plugins/modules/openshift_process.py +++ b/plugins/modules/openshift_process.py @@ -208,7 +208,10 @@ import os import copy import traceback -from ansible.module_utils.basic import AnsibleModule +try: + from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import AnsibleModule +except ImportError: + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_native try: @@ -253,6 +256,7 @@ class OpenShiftProcess(K8sAnsibleMixin): self.params = self.module.params self.check_mode = self.module.check_mode + self.client = get_api_client(self.module) @property def argspec(self): @@ -270,8 +274,6 @@ class OpenShiftProcess(K8sAnsibleMixin): return spec def execute_module(self): - self.client = get_api_client(self.module) - v1_templates = self.find_resource('templates', 'template.openshift.io/v1', fail=True) v1_processed_templates = self.find_resource('processedtemplates', 'template.openshift.io/v1', fail=True) diff --git a/plugins/modules/openshift_route.py b/plugins/modules/openshift_route.py index 0fd99e0..051056f 100644 --- a/plugins/modules/openshift_route.py +++ b/plugins/modules/openshift_route.py @@ -309,7 +309,10 @@ duration: import copy import traceback -from ansible.module_utils.basic import AnsibleModule +try: + from ansible_collections.kubernetes.core.plugins.module_utils.ansiblemodule import AnsibleModule +except ImportError: + from ansible.module_utils.basic import AnsibleModule from ansible.module_utils._text import to_native try: @@ -357,6 +360,7 @@ class OpenShiftRoute(K8sAnsibleMixin): self.check_mode = self.module.check_mode self.warnings = [] self.params['merge_type'] = None + self.client = get_api_client(self.module) @property def argspec(self): @@ -385,7 +389,6 @@ class OpenShiftRoute(K8sAnsibleMixin): return spec def execute_module(self): - self.client = get_api_client(self.module) v1_routes = self.find_resource('Route', 'route.openshift.io/v1', fail=True) service_name = self.params.get('service')