From 04ea66c4ab6cd1e5daa217526d7c9591aa164f10 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Wed, 8 Feb 2017 10:23:48 -0500
Subject: Added temporary kubeconfig file. Fixed tests to coincide with
 tmpfile.

---
 roles/lib_openshift/library/oadm_manage_node.py         | 4 ++--
 roles/lib_openshift/library/oc_edit.py                  | 4 ++--
 roles/lib_openshift/library/oc_label.py                 | 4 ++--
 roles/lib_openshift/library/oc_obj.py                   | 4 ++--
 roles/lib_openshift/library/oc_route.py                 | 4 ++--
 roles/lib_openshift/library/oc_scale.py                 | 4 ++--
 roles/lib_openshift/library/oc_secret.py                | 4 ++--
 roles/lib_openshift/library/oc_service.py               | 4 ++--
 roles/lib_openshift/library/oc_serviceaccount.py        | 4 ++--
 roles/lib_openshift/library/oc_serviceaccount_secret.py | 4 ++--
 roles/lib_openshift/library/oc_version.py               | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'roles/lib_openshift/library')

diff --git a/roles/lib_openshift/library/oadm_manage_node.py b/roles/lib_openshift/library/oadm_manage_node.py
index 7a24f7c44..8e217ac28 100644
--- a/roles/lib_openshift/library/oadm_manage_node.py
+++ b/roles/lib_openshift/library/oadm_manage_node.py
@@ -1019,7 +1019,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1028,7 +1028,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_edit.py b/roles/lib_openshift/library/oc_edit.py
index edd96ad3d..11b87a015 100644
--- a/roles/lib_openshift/library/oc_edit.py
+++ b/roles/lib_openshift/library/oc_edit.py
@@ -1047,7 +1047,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1056,7 +1056,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_label.py b/roles/lib_openshift/library/oc_label.py
index 24bf3c82e..f67eb2552 100644
--- a/roles/lib_openshift/library/oc_label.py
+++ b/roles/lib_openshift/library/oc_label.py
@@ -1023,7 +1023,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1032,7 +1032,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py
index c2976ba47..e4b8ac26c 100644
--- a/roles/lib_openshift/library/oc_obj.py
+++ b/roles/lib_openshift/library/oc_obj.py
@@ -1026,7 +1026,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1035,7 +1035,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py
index 5a4a09e7b..7c4fa1fbd 100644
--- a/roles/lib_openshift/library/oc_route.py
+++ b/roles/lib_openshift/library/oc_route.py
@@ -1051,7 +1051,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1060,7 +1060,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_scale.py b/roles/lib_openshift/library/oc_scale.py
index 728c11cb5..48a629b5e 100644
--- a/roles/lib_openshift/library/oc_scale.py
+++ b/roles/lib_openshift/library/oc_scale.py
@@ -1001,7 +1001,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1010,7 +1010,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_secret.py b/roles/lib_openshift/library/oc_secret.py
index c1c621162..526474f17 100644
--- a/roles/lib_openshift/library/oc_secret.py
+++ b/roles/lib_openshift/library/oc_secret.py
@@ -1047,7 +1047,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1056,7 +1056,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_service.py b/roles/lib_openshift/library/oc_service.py
index a9adff0b1..a9baef765 100644
--- a/roles/lib_openshift/library/oc_service.py
+++ b/roles/lib_openshift/library/oc_service.py
@@ -1053,7 +1053,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1062,7 +1062,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_serviceaccount.py b/roles/lib_openshift/library/oc_serviceaccount.py
index 773a3f176..cd0847963 100644
--- a/roles/lib_openshift/library/oc_serviceaccount.py
+++ b/roles/lib_openshift/library/oc_serviceaccount.py
@@ -999,7 +999,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1008,7 +1008,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_serviceaccount_secret.py b/roles/lib_openshift/library/oc_serviceaccount_secret.py
index fdaf6d93b..e22ccbfc2 100644
--- a/roles/lib_openshift/library/oc_serviceaccount_secret.py
+++ b/roles/lib_openshift/library/oc_serviceaccount_secret.py
@@ -999,7 +999,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -1008,7 +1008,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
diff --git a/roles/lib_openshift/library/oc_version.py b/roles/lib_openshift/library/oc_version.py
index 7ecf61016..e44375ffa 100644
--- a/roles/lib_openshift/library/oc_version.py
+++ b/roles/lib_openshift/library/oc_version.py
@@ -971,7 +971,7 @@ class Utils(object):
     @staticmethod
     def create_tmpfile_copy(inc_file):
         '''create a temporary copy of a file'''
-        tmpfile = Utils.create_tmpfile()
+        tmpfile = Utils.create_tmpfile('lib_openshift-')
         Utils._write(tmpfile, open(inc_file).read())
 
         # Cleanup the tmpfile
@@ -980,7 +980,7 @@ class Utils(object):
         return tmpfile
 
     @staticmethod
-    def create_tmpfile(prefix=None):
+    def create_tmpfile(prefix='tmp'):
         ''' Generates and returns a temporary file name '''
 
         with tempfile.NamedTemporaryFile(prefix=prefix, delete=False) as tmp:
-- 
cgit v1.2.3