diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-02-08 09:19:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-08 09:19:36 -0500 |
commit | 1321f28eb14f03a04ed4f3661629ca001ee83502 (patch) | |
tree | 1ad83e300ec589f9d4888293d2f62dc2c287af04 /roles/lib_openshift/src/class | |
parent | 5a933ed4b33131423b2f349eb0bc33ead99ec360 (diff) | |
parent | aa97c28b6a9b468498fffe565d314b07141f163b (diff) | |
download | openshift-1321f28eb14f03a04ed4f3661629ca001ee83502.tar.gz openshift-1321f28eb14f03a04ed4f3661629ca001ee83502.tar.bz2 openshift-1321f28eb14f03a04ed4f3661629ca001ee83502.tar.xz openshift-1321f28eb14f03a04ed4f3661629ca001ee83502.zip |
Merge pull request #3286 from twiest/fix_openshift_modules_temp_files
Changed lib_openshift to use real temporary files.
Diffstat (limited to 'roles/lib_openshift/src/class')
-rw-r--r-- | roles/lib_openshift/src/class/oc_obj.py | 2 | ||||
-rw-r--r-- | roles/lib_openshift/src/class/oc_secret.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/roles/lib_openshift/src/class/oc_obj.py b/roles/lib_openshift/src/class/oc_obj.py index 9d0b8e45b..2ec20e72c 100644 --- a/roles/lib_openshift/src/class/oc_obj.py +++ b/roles/lib_openshift/src/class/oc_obj.py @@ -49,7 +49,7 @@ class OCObject(OpenShiftCLI): return self._create(files[0]) content['data'] = yaml.dump(content['data']) - content_file = Utils.create_files_from_contents(content)[0] + content_file = Utils.create_tmp_files_from_contents(content)[0] return self._create(content_file['path']) diff --git a/roles/lib_openshift/src/class/oc_secret.py b/roles/lib_openshift/src/class/oc_secret.py index 40b2aa4d1..e99999c37 100644 --- a/roles/lib_openshift/src/class/oc_secret.py +++ b/roles/lib_openshift/src/class/oc_secret.py @@ -48,7 +48,7 @@ class OCSecret(OpenShiftCLI): def create(self, files=None, contents=None): '''Create a secret ''' if not files: - files = Utils.create_files_from_contents(contents) + files = Utils.create_tmp_files_from_contents(contents) secrets = ["%s=%s" % (sfile['name'], sfile['path']) for sfile in files] cmd = ['secrets', 'new', self.name] @@ -81,7 +81,7 @@ class OCSecret(OpenShiftCLI): This is accomplished by passing -ojson. This will most likely change in the future ''' if not files: - files = Utils.create_files_from_contents(contents) + files = Utils.create_tmp_files_from_contents(contents) secrets = ["%s=%s" % (sfile['name'], sfile['path']) for sfile in files] cmd = ['-ojson', 'secrets', 'new', self.name] @@ -132,7 +132,7 @@ class OCSecret(OpenShiftCLI): if params['files']: files = params['files'] elif params['contents']: - files = Utils.create_files_from_contents(params['contents']) + files = Utils.create_tmp_files_from_contents(params['contents']) else: return {'failed': True, 'msg': 'Either specify files or contents.'} @@ -146,7 +146,7 @@ class OCSecret(OpenShiftCLI): return {'changed': True, 'msg': 'Would have performed a create.'} - api_rval = ocsecret.create(params['files'], params['contents']) + api_rval = ocsecret.create(files, params['contents']) # Remove files if files and params['delete_after']: |