diff options
| -rw-r--r-- | roles/lib_openshift/library/oc_env.py | 2 | ||||
| -rw-r--r-- | roles/lib_openshift/src/ansible/oc_env.py | 1 | ||||
| -rw-r--r-- | roles/lib_openshift/src/class/oc_env.py | 3 | ||||
| -rwxr-xr-x | roles/lib_openshift/src/test/integration/oc_env.yml | 2 | ||||
| -rwxr-xr-x | roles/lib_openshift/src/test/unit/oc_env.py | 65 |
5 files changed, 7 insertions, 66 deletions
diff --git a/roles/lib_openshift/library/oc_env.py b/roles/lib_openshift/library/oc_env.py index 228f99d16..fa4191d1e 100644 --- a/roles/lib_openshift/library/oc_env.py +++ b/roles/lib_openshift/library/oc_env.py @@ -1603,6 +1603,7 @@ spec: # -*- -*- -*- Begin included fragment: class/oc_env.py -*- -*- -*- + # pylint: disable=too-many-instance-attributes class OCEnv(OpenShiftCLI): ''' Class to wrap the oc command line tools ''' @@ -1676,6 +1677,7 @@ class OCEnv(OpenShiftCLI): return self._replace_content(self.kind, self.name, self.resource.yaml_dict) + # pylint: disable=too-many-return-statements @staticmethod def run_ansible(params, check_mode): '''run the idempotent ansible code''' diff --git a/roles/lib_openshift/src/ansible/oc_env.py b/roles/lib_openshift/src/ansible/oc_env.py index 4a58f7ec1..e49295873 100644 --- a/roles/lib_openshift/src/ansible/oc_env.py +++ b/roles/lib_openshift/src/ansible/oc_env.py @@ -1,4 +1,5 @@ # pylint: skip-file +# flake8: noqa def main(): ''' diff --git a/roles/lib_openshift/src/class/oc_env.py b/roles/lib_openshift/src/class/oc_env.py index 10d44412a..b5e78bf90 100644 --- a/roles/lib_openshift/src/class/oc_env.py +++ b/roles/lib_openshift/src/class/oc_env.py @@ -1,4 +1,6 @@ # pylint: skip-file +# flake8: noqa + # pylint: disable=too-many-instance-attributes class OCEnv(OpenShiftCLI): @@ -73,6 +75,7 @@ class OCEnv(OpenShiftCLI): return self._replace_content(self.kind, self.name, self.resource.yaml_dict) + # pylint: disable=too-many-return-statements @staticmethod def run_ansible(params, check_mode): '''run the idempotent ansible code''' diff --git a/roles/lib_openshift/src/test/integration/oc_env.yml b/roles/lib_openshift/src/test/integration/oc_env.yml index 97a7c8922..cbb97ed46 100755 --- a/roles/lib_openshift/src/test/integration/oc_env.yml +++ b/roles/lib_openshift/src/test/integration/oc_env.yml @@ -6,7 +6,7 @@ user: root vars: my_env_var: - SOMEKEY : SOMEVALUE + SOMEKEY: SOMEVALUE check_env_var: name: DEFAULT_CERTIFICATE_DIR diff --git a/roles/lib_openshift/src/test/unit/oc_env.py b/roles/lib_openshift/src/test/unit/oc_env.py index eefd40b61..15bd7e464 100755 --- a/roles/lib_openshift/src/test/unit/oc_env.py +++ b/roles/lib_openshift/src/test/unit/oc_env.py @@ -343,71 +343,6 @@ class OCEnvTest(unittest.TestCase): 'env_vars': {'SOMEKEY': 'SOMEVALUE'}, } - dc_results_after = '''{ - "apiVersion": "v1", - "kind": "DeploymentConfig", - "metadata": { - "creationTimestamp": "2017-02-02T15:58:49Z", - "generation": 8, - "labels": { - "router": "router" - }, - "name": "router", - "namespace": "default", - "resourceVersion": "513678" - }, - "spec": { - "replicas": 2, - "selector": { - "router": "router" - }, - "template": { - "metadata": { - "creationTimestamp": null, - "labels": { - "router": "router" - } - }, - "spec": { - "containers": [ - { - "env": [ - { - "name": "DEFAULT_CERTIFICATE_DIR", - "value": "/etc/pki/tls/private" - }, - { - "name": "DEFAULT_CERTIFICATE_PATH", - "value": "/etc/pki/tls/private/tls.crt" - }, - { - "name": "ROUTER_EXTERNAL_HOST_HOSTNAME" - }, - { - "name": "ROUTER_EXTERNAL_HOST_HTTPS_VSERVER" - }, - { - "name": "ROUTER_EXTERNAL_HOST_HTTP_VSERVER" - }, - { - "name": "ROUTER_EXTERNAL_HOST_INSECURE", - "value": "false" - } - ], - "name": "router" - } - ] - } - }, - "test": false, - "triggers": [ - { - "type": "ConfigChange" - } - ] - } - }''' - dc_results_before = '''{ "apiVersion": "v1", "kind": "DeploymentConfig", |