[Devops] Reverted zuul route for uaa

crss-edge/crss-edge-azure.yml

@@ -1,8 +1,4 @@
-zuul:
-  routes:
-    uaa:
-      url: crss1uaa-server.marathon.l4lb.thisdcos.directory:9999
-
+spring:
 admin-service:
   ribbon:
     listOfServers: crss1admin-service.marathon.l4lb.thisdcos.directory:8080
@@ -32,4 +28,7 @@ crss-datainterface-app:
     listOfServers: crss2datainterface-app.marathon.l4lb.thisdcos.directory:8084
 crss-audit:
   ribbon:
-    listOfServers: crss2audit.marathon.l4lb.thisdcos.directory:9094
+    listOfServers: crss2audit.marathon.l4lb.thisdcos.directory:9094
+crss-uaa:
+  ribbon:
+    listOfServers: crss1uaa-server.marathon.l4lb.thisdcos.directory:9999

crss-edge/crss-edge-dev.yml

@@ -1,8 +1,3 @@
-zuul:
-  routes:
-    uaa:
-      url: http://localhost:9999
-
 admin-service:
   ribbon:
     listOfServers: http://localhost:8082
@@ -32,4 +27,7 @@ crss-dataflow-app:
     listOfServers: http://localhost:9092
 crss-datainterface-app:
   ribbon:
-    listOfServers: http://localhost:9094
+    listOfServers: http://localhost:9094
+crss-uaa:
+  ribbon:
+    listOfServers: http://localhost:9999

crss-edge/crss-edge.yml

@@ -40,7 +40,7 @@ zuul:
     uaa:
       path: /uaa/**
       stripPrefix: false
-      url: crsscrss-uaa.marathon.l4lb.thisdcos.directory:9999
+      serviceId: crss-uaa
 
 admin-service:
   ribbon:
@@ -72,6 +72,10 @@ crss-datainterface-app:
 crss-audit:
   ribbon:
     listOfServers: crss-audit.marathon.l4lb.thisdcos.directory:9094
+crss-uaa:
+  ribbon:
+    listOfSevers: crsscrss-uaa.marathon.l4lb.thisdcos.directory:9999
+
 
 hystrix:
   command:

crss-uaa/crss-uaa.yml

@@ -25,7 +25,7 @@ crss:
       auto-approve: true
       authorized-grant-types: authorization_code,refresh_token,password
       access-token-validity-second: 3600
-      registered-redirect-uris: http://crss.prod.crss.wesmsys.local,http://bsmd.prod.crss.wesmsys.local
+      registered-redirect-uris: crss.prod.crss.wesmsys.local,bsmd.prod.crss.wesmsys.local,http://crss.prod.crss.wesmsys.local,http://bsmd.prod.crss.wesmsys.local
       client:
         client-id: crss
         client-secret: crsssecret