Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #7558 from fabianvf/bz1555426

Bug 1555426- yedit now appends an ISO8601 formatted datetime string to file backups
Scott Dodson 7 years ago
parent
8a0fde1c2d ffc860e471
commit
f28aba492e
36 changed files with 61 additions and 39 deletions
Unified View Show Diff Stats
  1. 2 2
      roles/lib_openshift/library/oc_adm_ca_server_cert.py
  2. 2 2
      roles/lib_openshift/library/oc_adm_csr.py
  3. 2 1
      roles/lib_openshift/library/oc_adm_manage_node.py
  4. 2 1
      roles/lib_openshift/library/oc_adm_policy_group.py
  5. 2 1
      roles/lib_openshift/library/oc_adm_policy_user.py
  6. 2 1
      roles/lib_openshift/library/oc_adm_registry.py
  7. 2 2
      roles/lib_openshift/library/oc_adm_router.py
  8. 2 1
      roles/lib_openshift/library/oc_clusterrole.py
  9. 2 1
      roles/lib_openshift/library/oc_configmap.py
  10. 2 1
      roles/lib_openshift/library/oc_edit.py
  11. 2 1
      roles/lib_openshift/library/oc_env.py
  12. 2 1
      roles/lib_openshift/library/oc_group.py
  13. 2 1
      roles/lib_openshift/library/oc_image.py
  14. 2 1
      roles/lib_openshift/library/oc_label.py
  15. 2 1
      roles/lib_openshift/library/oc_obj.py
  16. 2 1
      roles/lib_openshift/library/oc_objectvalidator.py
  17. 2 1
      roles/lib_openshift/library/oc_process.py
  18. 2 1
      roles/lib_openshift/library/oc_project.py
  19. 2 1
      roles/lib_openshift/library/oc_pvc.py
  20. 2 1
      roles/lib_openshift/library/oc_route.py
  21. 2 1
      roles/lib_openshift/library/oc_scale.py
  22. 2 1
      roles/lib_openshift/library/oc_secret.py
  23. 2 1
      roles/lib_openshift/library/oc_service.py
  24. 2 1
      roles/lib_openshift/library/oc_serviceaccount.py
  25. 2 1
      roles/lib_openshift/library/oc_serviceaccount_secret.py
  26. 2 2
      roles/lib_openshift/library/oc_storageclass.py
  27. 2 1
      roles/lib_openshift/library/oc_user.py
  28. 2 1
      roles/lib_openshift/library/oc_version.py
  29. 2 1
      roles/lib_openshift/library/oc_volume.py
  30. 0 1
      roles/lib_openshift/src/class/oc_adm_ca_server_cert.py
  31. 0 1
      roles/lib_openshift/src/class/oc_adm_csr.py
  32. 0 1
      roles/lib_openshift/src/class/oc_adm_router.py
  33. 0 1
      roles/lib_openshift/src/class/oc_storageclass.py
  34. 1 0
      roles/lib_openshift/src/lib/import.py
  35. 1 1
      roles/lib_utils/library/yedit.py
  36. 1 1
      roles/lib_utils/src/class/yedit.py

+ 2 - 2
roles/lib_openshift/library/oc_adm_ca_server_cert.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -377,7 +378,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:
 
@@ -1524,7 +1525,6 @@ class CAServerCert(OpenShiftCLI):
 
         # Added this here as a safegaurd for stomping on the
 
         # Added this here as a safegaurd for stomping on the
 
         # cert and key files if they exist
 
         # cert and key files if they exist
 
         if self.config.config_options['backup']['value']:
 
         if self.config.config_options['backup']['value']:
 
-            import time
 
             ext = time.strftime("%Y-%m-%d@%H:%M:%S", time.localtime(time.time()))
 
             ext = time.strftime("%Y-%m-%d@%H:%M:%S", time.localtime(time.time()))
 
             date_str = "%s_" + "%s" % ext
 
             date_str = "%s_" + "%s" % ext

+ 2 - 2
roles/lib_openshift/library/oc_adm_csr.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -355,7 +356,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:
 
@@ -1637,7 +1638,6 @@ class OCcsr(OpenShiftCLI):
 
             all_results = []
 
             all_results = []
 
             finished = False
 
             finished = False
 
             timeout = False
 
             timeout = False
 
-            import time
 
             # loop for timeout or block until all nodes pass
 
             # loop for timeout or block until all nodes pass
 
             ctr = 0
 
             ctr = 0
 
             while True:
 
             while True:

+ 2 - 1
roles/lib_openshift/library/oc_adm_manage_node.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -363,7 +364,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_adm_policy_group.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -349,7 +350,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_adm_policy_user.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -363,7 +364,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_adm_registry.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -467,7 +468,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 2
roles/lib_openshift/library/oc_adm_router.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -492,7 +493,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:
 
@@ -2956,7 +2957,6 @@ class Router(OpenShiftCLI):
 
         results = []
 
         results = []
 
         self.needs_update()
 
         self.needs_update()
 
 
 
-        import time
 
         # pylint: disable=maybe-no-member
 
         # pylint: disable=maybe-no-member
 
         for kind, oc_data in self.prepared_router.items():
 
         for kind, oc_data in self.prepared_router.items():
 
             if oc_data['obj'] is not None:
 
             if oc_data['obj'] is not None:

+ 2 - 1
roles/lib_openshift/library/oc_clusterrole.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -341,7 +342,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_configmap.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -347,7 +348,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_edit.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -397,7 +398,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_env.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -358,7 +359,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_group.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -331,7 +332,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_image.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -350,7 +351,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_label.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -367,7 +368,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_obj.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -376,7 +377,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_objectvalidator.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -302,7 +303,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_process.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -359,7 +360,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_project.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -356,7 +357,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_pvc.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -363,7 +364,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_route.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -407,7 +408,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_scale.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -345,7 +346,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_secret.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -403,7 +404,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_service.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -410,7 +411,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_serviceaccount.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -343,7 +344,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_serviceaccount_secret.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -343,7 +344,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 2
roles/lib_openshift/library/oc_storageclass.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -361,7 +362,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:
 
@@ -1594,7 +1595,6 @@ class OCStorageClass(OpenShiftCLI):
 
         self.delete()
 
         self.delete()
 
         # pause here and attempt to wait for delete.
 
         # pause here and attempt to wait for delete.
 
         # Better option would be to poll
 
         # Better option would be to poll
 
-        import time
 
         time.sleep(5)
 
         time.sleep(5)
 
         return self.create()
 
         return self.create()

+ 2 - 1
roles/lib_openshift/library/oc_user.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -403,7 +404,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_version.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -315,7 +316,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 2 - 1
roles/lib_openshift/library/oc_volume.py
View File 

@@ -36,6 +36,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil
 
@@ -392,7 +393,7 @@ class Yedit(object):  # pragma: no cover
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 0 - 1
roles/lib_openshift/src/class/oc_adm_ca_server_cert.py
View File 

@@ -37,7 +37,6 @@ class CAServerCert(OpenShiftCLI):
 
         # Added this here as a safegaurd for stomping on the
 
         # Added this here as a safegaurd for stomping on the
 
         # cert and key files if they exist
 
         # cert and key files if they exist
 
         if self.config.config_options['backup']['value']:
 
         if self.config.config_options['backup']['value']:
 
-            import time
 
             ext = time.strftime("%Y-%m-%d@%H:%M:%S", time.localtime(time.time()))
 
             ext = time.strftime("%Y-%m-%d@%H:%M:%S", time.localtime(time.time()))
 
             date_str = "%s_" + "%s" % ext
 
             date_str = "%s_" + "%s" % ext

+ 0 - 1
roles/lib_openshift/src/class/oc_adm_csr.py
View File 

@@ -172,7 +172,6 @@ class OCcsr(OpenShiftCLI):
 
             all_results = []
 
             all_results = []
 
             finished = False
 
             finished = False
 
             timeout = False
 
             timeout = False
 
-            import time
 
             # loop for timeout or block until all nodes pass
 
             # loop for timeout or block until all nodes pass
 
             ctr = 0
 
             ctr = 0
 
             while True:
 
             while True:

+ 0 - 1
roles/lib_openshift/src/class/oc_adm_router.py
View File 

@@ -280,7 +280,6 @@ class Router(OpenShiftCLI):
 
         results = []
 
         results = []
 
         self.needs_update()
 
         self.needs_update()
 
 
 
-        import time
 
         # pylint: disable=maybe-no-member
 
         # pylint: disable=maybe-no-member
 
         for kind, oc_data in self.prepared_router.items():
 
         for kind, oc_data in self.prepared_router.items():
 
             if oc_data['obj'] is not None:
 
             if oc_data['obj'] is not None:

+ 0 - 1
roles/lib_openshift/src/class/oc_storageclass.py
View File 

@@ -48,7 +48,6 @@ class OCStorageClass(OpenShiftCLI):
 
         self.delete()
 
         self.delete()
 
         # pause here and attempt to wait for delete.
 
         # pause here and attempt to wait for delete.
 
         # Better option would be to poll
 
         # Better option would be to poll
 
-        import time
 
         time.sleep(5)
 
         time.sleep(5)
 
         return self.create()
 
         return self.create()

+ 1 - 0
roles/lib_openshift/src/lib/import.py
View File 

@@ -10,6 +10,7 @@ import atexit
 
 import copy
 
 import copy
 
 import fcntl
 
 import fcntl
 
 import json
 
 import json
 
+import time
 
 import os
 
 import os
 
 import re
 
 import re
 
 import shutil
 
 import shutil

+ 1 - 1
roles/lib_utils/library/yedit.py
View File 

@@ -425,7 +425,7 @@ class Yedit(object):
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try:

+ 1 - 1
roles/lib_utils/src/class/yedit.py
View File 

@@ -221,7 +221,7 @@ class Yedit(object):
 
             raise YeditException('Please specify a filename.')
 
             raise YeditException('Please specify a filename.')
 
 
 
         if self.backup and self.file_exists():
 
         if self.backup and self.file_exists():
 
-            shutil.copy(self.filename, self.filename + '.orig')
 
+            shutil.copy(self.filename, '{}.{}'.format(self.filename, time.strftime("%Y%m%dT%H%M%S")))
 
 
 
         # Try to set format attributes if supported
 
         # Try to set format attributes if supported
 
         try:
 
         try: