diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2017-02-06 17:12:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 17:12:24 -0500 |
| commit | e0a074962abfdaadd177e90c56d186c13d814609 (patch) | |
| tree | 6b47b62fab751b4007c6627bedc6b362bd1f468b /roles/lib_utils | |
| parent | 41ff6013a19c77fdc35adcf58ad523069f20ee2f (diff) | |
| parent | d508ec24877a743c6d79dac0574c859e14d40218 (diff) | |
| download | openshift-e0a074962abfdaadd177e90c56d186c13d814609.tar.gz openshift-e0a074962abfdaadd177e90c56d186c13d814609.tar.bz2 openshift-e0a074962abfdaadd177e90c56d186c13d814609.tar.xz openshift-e0a074962abfdaadd177e90c56d186c13d814609.zip | |
Merge pull request #3264 from twiest/oc_serviceaccount_secret
Added oc_serviceaccount_secret to lib_openshift.
Diffstat (limited to 'roles/lib_utils')
| -rw-r--r-- | roles/lib_utils/library/yedit.py | 23 | ||||
| -rw-r--r-- | roles/lib_utils/src/class/yedit.py | 23 |
2 files changed, 30 insertions, 16 deletions
diff --git a/roles/lib_utils/library/yedit.py b/roles/lib_utils/library/yedit.py index 7ad2b7181..1c74b4d3f 100644 --- a/roles/lib_utils/library/yedit.py +++ b/roles/lib_utils/library/yedit.py @@ -356,6 +356,17 @@ class Yedit(object): return data + @staticmethod + def _write(filename, contents): + ''' Actually write the file contents to disk. This helps with mocking. ''' + + tmp_filename = filename + '.yedit' + + with open(tmp_filename, 'w') as yfd: + yfd.write(contents) + + os.rename(tmp_filename, filename) + def write(self): ''' write to file ''' if not self.filename: @@ -364,15 +375,11 @@ class Yedit(object): if self.backup and self.file_exists(): shutil.copy(self.filename, self.filename + '.orig') - tmp_filename = self.filename + '.yedit' - with open(tmp_filename, 'w') as yfd: - # pylint: disable=no-member - if hasattr(self.yaml_dict, 'fa'): - self.yaml_dict.fa.set_block_style() - - yfd.write(yaml.dump(self.yaml_dict, Dumper=yaml.RoundTripDumper)) + # pylint: disable=no-member + if hasattr(self.yaml_dict, 'fa'): + self.yaml_dict.fa.set_block_style() - os.rename(tmp_filename, self.filename) + Yedit._write(self.filename, yaml.dump(self.yaml_dict, Dumper=yaml.RoundTripDumper)) return (True, self.yaml_dict) diff --git a/roles/lib_utils/src/class/yedit.py b/roles/lib_utils/src/class/yedit.py index b1644f9b2..8542fe5c7 100644 --- a/roles/lib_utils/src/class/yedit.py +++ b/roles/lib_utils/src/class/yedit.py @@ -175,6 +175,17 @@ class Yedit(object): return data + @staticmethod + def _write(filename, contents): + ''' Actually write the file contents to disk. This helps with mocking. ''' + + tmp_filename = filename + '.yedit' + + with open(tmp_filename, 'w') as yfd: + yfd.write(contents) + + os.rename(tmp_filename, filename) + def write(self): ''' write to file ''' if not self.filename: @@ -183,15 +194,11 @@ class Yedit(object): if self.backup and self.file_exists(): shutil.copy(self.filename, self.filename + '.orig') - tmp_filename = self.filename + '.yedit' - with open(tmp_filename, 'w') as yfd: - # pylint: disable=no-member - if hasattr(self.yaml_dict, 'fa'): - self.yaml_dict.fa.set_block_style() - - yfd.write(yaml.dump(self.yaml_dict, Dumper=yaml.RoundTripDumper)) + # pylint: disable=no-member + if hasattr(self.yaml_dict, 'fa'): + self.yaml_dict.fa.set_block_style() - os.rename(tmp_filename, self.filename) + Yedit._write(self.filename, yaml.dump(self.yaml_dict, Dumper=yaml.RoundTripDumper)) return (True, self.yaml_dict) |