diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-03 12:12:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 12:12:46 -0500 |
| commit | 13f91534f8e8539bfe31e50a38f5b69cbc124ed9 (patch) | |
| tree | 75fa8a949be38bda3cbd79e7c8f445e5d01087f2 /filter_plugins/oo_filters.py | |
| parent | 1163633a1de10133f0fca505e88f4d4610314882 (diff) | |
| parent | 828ccd86df772bc5dbf5617dd257740338e81e30 (diff) | |
| download | openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.tar.gz openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.tar.bz2 openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.tar.xz openshift-13f91534f8e8539bfe31e50a38f5b69cbc124ed9.zip | |
Merge pull request #4062 from abutcher/atomicf25
Merged by openshift-bot
Diffstat (limited to 'filter_plugins/oo_filters.py')
| -rw-r--r-- | filter_plugins/oo_filters.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 10c8600ba..d61184c48 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -11,6 +11,7 @@ import pdb import random import re +from base64 import b64encode from collections import Mapping # pylint no-name-in-module and import-error disabled here because pylint # fails to properly detect the packages when installed in a virtualenv @@ -672,8 +673,7 @@ def oo_generate_secret(num_bytes): if not isinstance(num_bytes, int): raise errors.AnsibleFilterError("|failed expects num_bytes is int") - secret = os.urandom(num_bytes) - return secret.encode('base-64').strip() + return b64encode(os.urandom(num_bytes)).decode('utf-8') def to_padded_yaml(data, level=0, indent=2, **kw): |