From 74e890482f2be933634286f8b4cf488287cf6d39 Mon Sep 17 00:00:00 2001
From: Kenny Woodson <kwoodson@redhat.com>
Date: Mon, 27 Feb 2017 19:01:32 -0500
Subject: Modified base debug statements.  Fixed oc_secret debug/verbose flag. 
 Added reencrypt for route.

---
 roles/lib_openshift/src/class/oc_adm_registry.py | 5 ++++-
 roles/lib_openshift/src/class/oc_route.py        | 2 +-
 roles/lib_openshift/src/class/oc_service.py      | 6 ++++--
 roles/lib_openshift/src/lib/base.py              | 4 ++--
 roles/lib_openshift/src/lib/service.py           | 5 +++++
 5 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'roles/lib_openshift/src')

diff --git a/roles/lib_openshift/src/class/oc_adm_registry.py b/roles/lib_openshift/src/class/oc_adm_registry.py
index 35b417059..06de2ba12 100644
--- a/roles/lib_openshift/src/class/oc_adm_registry.py
+++ b/roles/lib_openshift/src/class/oc_adm_registry.py
@@ -109,7 +109,7 @@ class Registry(OpenShiftCLI):
             if result['returncode'] == 0 and part['kind'] == 'dc':
                 self.deploymentconfig = DeploymentConfig(result['results'][0])
             elif result['returncode'] == 0 and part['kind'] == 'svc':
-                self.service = Yedit(content=result['results'][0])
+                self.service = Service(result['results'][0])
 
             if result['returncode'] != 0:
                 rval = result['returncode']
@@ -179,6 +179,9 @@ class Registry(OpenShiftCLI):
         if self.portal_ip:
             service.put('spec.portalIP', self.portal_ip)
 
+        # the dry-run doesn't apply the selector correctly
+        service.put('spec.selector', self.service.get_selector())
+
         # need to create the service and the deploymentconfig
         service_file = Utils.create_tmp_file_from_contents('service', service.yaml_dict)
         deployment_file = Utils.create_tmp_file_from_contents('deploymentconfig', deploymentconfig.yaml_dict)
diff --git a/roles/lib_openshift/src/class/oc_route.py b/roles/lib_openshift/src/class/oc_route.py
index 122cc5fe9..33ffdcb66 100644
--- a/roles/lib_openshift/src/class/oc_route.py
+++ b/roles/lib_openshift/src/class/oc_route.py
@@ -56,7 +56,7 @@ class OCRoute(OpenShiftCLI):
     def update(self):
         '''update the object'''
         # when the host attribute is being updated, we need to delete and recreate
-        if self.config.host != self.route.host:
+        if self.config.host != self.route.get_host():
             import time
             self.delete()
             time.sleep(3)
diff --git a/roles/lib_openshift/src/class/oc_service.py b/roles/lib_openshift/src/class/oc_service.py
index d4cc83a59..20cf23df5 100644
--- a/roles/lib_openshift/src/class/oc_service.py
+++ b/roles/lib_openshift/src/class/oc_service.py
@@ -22,7 +22,7 @@ class OCService(OpenShiftCLI):
                  kubeconfig='/etc/origin/master/admin.kubeconfig',
                  verbose=False):
         ''' Constructor for OCVolume '''
-        super(OCService, self).__init__(namespace, kubeconfig)
+        super(OCService, self).__init__(namespace, kubeconfig, verbose)
         self.namespace = namespace
         self.config = ServiceConfig(sname, namespace, ports, selector, labels,
                                     cluster_ip, portal_ip, session_affinity, service_type)
@@ -93,7 +93,9 @@ class OCService(OpenShiftCLI):
                            params['portalip'],
                            params['ports'],
                            params['session_affinity'],
-                           params['service_type'])
+                           params['service_type'],
+                           params['kubeconfig'],
+                           params['debug'])
 
         state = params['state']
 
diff --git a/roles/lib_openshift/src/lib/base.py b/roles/lib_openshift/src/lib/base.py
index 53b9f9947..d037074a5 100644
--- a/roles/lib_openshift/src/lib/base.py
+++ b/roles/lib_openshift/src/lib/base.py
@@ -523,8 +523,8 @@ class Utils(object):
                     elif value != user_def[key]:
                         if debug:
                             print('value should be identical')
-                            print(value)
                             print(user_def[key])
+                            print(value)
                         return False
 
             # recurse on a dictionary
@@ -544,8 +544,8 @@ class Utils(object):
                 if api_values != user_values:
                     if debug:
                         print("keys are not equal in dict")
-                        print(api_values)
                         print(user_values)
+                        print(api_values)
                     return False
 
                 result = Utils.check_def_equal(user_def[key], value, skip_keys=skip_keys, debug=debug)
diff --git a/roles/lib_openshift/src/lib/service.py b/roles/lib_openshift/src/lib/service.py
index ffe27da47..eef568779 100644
--- a/roles/lib_openshift/src/lib/service.py
+++ b/roles/lib_openshift/src/lib/service.py
@@ -67,6 +67,7 @@ class Service(Yedit):
     port_path = "spec.ports"
     portal_ip = "spec.portalIP"
     cluster_ip = "spec.clusterIP"
+    selector_path = 'spec.selector'
     kind = 'Service'
 
     def __init__(self, content):
@@ -77,6 +78,10 @@ class Service(Yedit):
         ''' get a list of ports '''
         return self.get(Service.port_path) or []
 
+    def get_selector(self):
+        ''' get the service selector'''
+        return self.get(Service.selector_path) or {}
+
     def add_ports(self, inc_ports):
         ''' add a port object to the ports list '''
         if not isinstance(inc_ports, list):
-- 
cgit v1.2.3