From d338c1aefc702919e6fac553c60a69455ae37d05 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Tue, 7 Feb 2017 21:44:47 -0500 Subject: Adding oc_env to lib_openshift. --- roles/lib_openshift/src/ansible/oc_env.py | 32 +++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 roles/lib_openshift/src/ansible/oc_env.py (limited to 'roles/lib_openshift/src/ansible') diff --git a/roles/lib_openshift/src/ansible/oc_env.py b/roles/lib_openshift/src/ansible/oc_env.py new file mode 100644 index 000000000..4a58f7ec1 --- /dev/null +++ b/roles/lib_openshift/src/ansible/oc_env.py @@ -0,0 +1,32 @@ +# pylint: skip-file + +def main(): + ''' + ansible oc module for environment variables + ''' + + module = AnsibleModule( + argument_spec=dict( + kubeconfig=dict(default='/etc/origin/master/admin.kubeconfig', type='str'), + state=dict(default='present', type='str', + choices=['present', 'absent', 'list']), + debug=dict(default=False, type='bool'), + kind=dict(default='rc', choices=['dc', 'rc', 'pods'], type='str'), + namespace=dict(default='default', type='str'), + name=dict(default=None, required=True, type='str'), + env_vars=dict(default=None, type='dict'), + ), + mutually_exclusive=[["content", "files"]], + + supports_check_mode=True, + ) + results = OCEnv.run_ansible(module.params, module.check_mode) + + if 'failed' in results: + module.fail_json(**results) + + module.exit_json(**results) + + +if __name__ == '__main__': + main() -- cgit v1.2.3 From ffac7eac61666332d8d6c6484c5648b48dcaa648 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Wed, 8 Feb 2017 17:03:29 -0500 Subject: Pleasing the linting bot. --- roles/lib_openshift/library/oc_env.py | 2 + roles/lib_openshift/src/ansible/oc_env.py | 1 + roles/lib_openshift/src/class/oc_env.py | 3 + .../lib_openshift/src/test/integration/oc_env.yml | 2 +- roles/lib_openshift/src/test/unit/oc_env.py | 65 ---------------------- 5 files changed, 7 insertions(+), 66 deletions(-) (limited to 'roles/lib_openshift/src/ansible') 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", -- cgit v1.2.3