Эх сурвалжийг харах

[Devops] Added dev profile for uaa and edge server

Nas Villanueva 8 жил өмнө
parent
commit
0d7f04f871

+ 3 - 5
crss-edge/crss-edge-azure.yml

@@ -26,8 +26,6 @@ crss-dataflow-app:
 crss-audit:
   ribbon:
     listOfServers: crss2audit.marathon.l4lb.thisdcos.directory:9094
-
-zuul:
-  routes:
-    uaa:
-      url: http://crss1uaa-server.marathon.l4lb.thisdcos.directory:9999
+crss-uaa:
+  ribbon:
+    listOfServers: crss1uaa-server.marathon.l4lb.thisdcos.directory:9999

+ 0 - 1
crss-edge/crss-edge-dev.yml

@@ -1,4 +1,3 @@
-spring:
 admin-service:
   ribbon:
     listOfServers: http://localhost:8082

+ 5 - 1
crss-edge/crss-edge.yml

@@ -37,7 +37,7 @@ zuul:
     uaa:
       path: /uaa/**
       stripPrefix: false
-      url: http://crsscrss-uaa.marathon.l4lb.thisdcos.directory:9999
+      serviceId: crss-uaa
 
 admin-service:
   ribbon:
@@ -66,6 +66,10 @@ crss-dataflow-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:

+ 11 - 0
crss-uaa/crss-uaa-dev.yml

@@ -0,0 +1,11 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://localhost:5432/crss?currentSchema=admin
+    username: crss_admin
+    password: CrssAdmin
+
+crss:
+  security:
+    oauth2:
+      default-redirect-uri: http://localhost:8087
+      registered-redirect-uris: http://localhost:8087,http://localhost:8089