diff options
author | Andrew Butcher <abutcher@redhat.com> | 2015-12-03 14:09:42 -0500 |
---|---|---|
committer | Andrew Butcher <abutcher@redhat.com> | 2016-01-04 09:16:11 -0500 |
commit | 9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2 (patch) | |
tree | 751b98c15e57c828d84eecb9a3f086133f53178e /filter_plugins | |
parent | fb1b9ff7d3293c821a8569ae95dcc8a98dfbf967 (diff) | |
download | openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.tar.gz openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.tar.bz2 openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.tar.xz openshift-9b760b0a89a77c5be0b3521a2c35b5afcb2a20d2.zip |
Clean up idempotency issues with session secrets.
Diffstat (limited to 'filter_plugins')
-rw-r--r-- | filter_plugins/oo_filters.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 48e27a24a..326c36f6c 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -8,12 +8,11 @@ Custom filters for use in openshift-ansible from ansible import errors from operator import itemgetter import OpenSSL.crypto -import os.path +import os import pdb import re import json - class FilterModule(object): ''' Custom ansible filters ''' @@ -366,9 +365,6 @@ class FilterModule(object): "keyfile": "/etc/origin/master/named_certificates/custom2.key", "names": [ "some-hostname.com" ] }] ''' - if not issubclass(type(certificates), list): - raise errors.AnsibleFilterError("|failed expects certificates is a list") - if not issubclass(type(named_certs_dir), unicode): raise errors.AnsibleFilterError("|failed expects named_certs_dir is unicode") @@ -468,6 +464,16 @@ class FilterModule(object): pass return clusters + @staticmethod + def oo_generate_secret(num_bytes): + ''' generate a session secret ''' + + if not issubclass(type(num_bytes), int): + raise errors.AnsibleFilterError("|failed expects num_bytes is int") + + secret = os.urandom(num_bytes) + return secret.encode('base-64').strip() + def filters(self): ''' returns a mapping of filters to methods ''' return { @@ -486,5 +492,6 @@ class FilterModule(object): "oo_parse_heat_stack_outputs": self.oo_parse_heat_stack_outputs, "oo_parse_named_certificates": self.oo_parse_named_certificates, "oo_haproxy_backend_masters": self.oo_haproxy_backend_masters, - "oo_pretty_print_cluster": self.oo_pretty_print_cluster + "oo_pretty_print_cluster": self.oo_pretty_print_cluster, + "oo_generate_secret": self.oo_generate_secret } |