From 315657e7befc62502e446dd889f96cfa4c0f5458 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Thu, 23 Feb 2017 11:34:05 -0500
Subject: Fixed default variables.  Added a fix to generated secret in env var.

---
 roles/lib_openshift/src/lib/deploymentconfig.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'roles/lib_openshift/src/lib')

diff --git a/roles/lib_openshift/src/lib/deploymentconfig.py b/roles/lib_openshift/src/lib/deploymentconfig.py
index e37475ef5..6a0920d37 100644
--- a/roles/lib_openshift/src/lib/deploymentconfig.py
+++ b/roles/lib_openshift/src/lib/deploymentconfig.py
@@ -189,6 +189,18 @@ spec:
 
         return None
 
+    def get_env_var(self, key):
+        '''return a environment variables '''
+        results = self.get(DeploymentConfig.env_path) or []
+        if not results:
+           return None
+
+        for env_var in results:
+            if env_var['name'] == key:
+                return env_var
+
+        return None
+
     def get_replicas(self):
         ''' return replicas setting '''
         return self.get(DeploymentConfig.replicas_path)
-- 
cgit v1.2.3


From 51dd7e556b3dafab88b571b370ecbfc99bcd0ae0 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 24 Feb 2017 11:50:33 -0500
Subject: Adding get_env_var to deploymentconfig.

---
 roles/lib_openshift/src/lib/deploymentconfig.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'roles/lib_openshift/src/lib')

diff --git a/roles/lib_openshift/src/lib/deploymentconfig.py b/roles/lib_openshift/src/lib/deploymentconfig.py
index 6a0920d37..327c8386d 100644
--- a/roles/lib_openshift/src/lib/deploymentconfig.py
+++ b/roles/lib_openshift/src/lib/deploymentconfig.py
@@ -105,6 +105,18 @@ spec:
 
         return False
 
+    def get_env_var(self, key):
+        '''return a environment variables '''
+        results = self.get(DeploymentConfig.env_path) or []
+        if not results:
+           return None
+
+        for env_var in results:
+            if env_var['name'] == key:
+                return env_var
+
+        return None
+
     def get_env_vars(self):
         '''return a environment variables '''
         return self.get(DeploymentConfig.env_path) or []
@@ -189,18 +201,6 @@ spec:
 
         return None
 
-    def get_env_var(self, key):
-        '''return a environment variables '''
-        results = self.get(DeploymentConfig.env_path) or []
-        if not results:
-           return None
-
-        for env_var in results:
-            if env_var['name'] == key:
-                return env_var
-
-        return None
-
     def get_replicas(self):
         ''' return replicas setting '''
         return self.get(DeploymentConfig.replicas_path)
-- 
cgit v1.2.3


From 2c0c26d828203e364ec282bfd0541e1a287da14c Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Fri, 24 Feb 2017 13:27:58 -0500
Subject: Fixed indentation

---
 roles/lib_openshift/src/lib/deploymentconfig.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roles/lib_openshift/src/lib')

diff --git a/roles/lib_openshift/src/lib/deploymentconfig.py b/roles/lib_openshift/src/lib/deploymentconfig.py
index 327c8386d..0549bba84 100644
--- a/roles/lib_openshift/src/lib/deploymentconfig.py
+++ b/roles/lib_openshift/src/lib/deploymentconfig.py
@@ -109,7 +109,7 @@ spec:
         '''return a environment variables '''
         results = self.get(DeploymentConfig.env_path) or []
         if not results:
-           return None
+            return None
 
         for env_var in results:
             if env_var['name'] == key:
-- 
cgit v1.2.3