changed url's in azure configs

crss-audit/application-azure.yml

@@ -35,10 +35,10 @@ server:
 security:
   oauth2:
     client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
     resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
 logging:
   level:

crss-dataflow-app/application-azure.yml

@@ -45,10 +45,10 @@ server:
 security:
   oauth2:
     client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
     resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
 logging:
   level:

crss-meterprocess-app/application-azure.yml

@@ -57,28 +57,13 @@ server:
     enabled: true
     min-response-size: 1
 
-eureka:
-  instance:
-    prefer-ip-address: false
-    hostname: crss-meterprocess-app.marathon.l4lb.thisdcos.directory
-  client:
-    serviceUrl:
-      defaultZone: http://crss-discovery.marathon.l4lb.thisdcos.directory:8761/eureka/
-#          healthcheck:
-#            enabled: true
-#    lease:
-#      duration: 5
-#  instance:
-#    leaseRenewalIntervalInSeconds: 1
-#    leaseExpirationDurationInSeconds: 2
-
 security:
   oauth2:
     client:
-      accessTokenUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
-      userAuthorizationUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
+      accessTokenUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/access_token
+      userAuthorizationUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/oauth/authorize
     resource:
-      userInfoUri: http://crss-admin.marathon.l4lb.thisdcos.directory:8080/user
+      userInfoUri: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080/user
 
 logging:
   level:

crss-settlement-app/application-dev2.yml

@@ -8,15 +8,15 @@ spring:
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
-    jpa:
-      show-sql: false
-      generate-ddl: true
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQL81Dialect
-          ddl-auto: validate
-          hbm2ddl:
-            import_files:
+  jpa:
+    show-sql: false
+    generate-ddl: true
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL81Dialect
+        ddl-auto: validate
+        hbm2ddl:
+          import_files:
 
   # prevent batch job from running on app start
   batch:

ui-bsmd/application-azure.yml

@@ -32,6 +32,7 @@ zuul:
       path: /audit/**
       serviceId: crss-audit
 
+
 crss-meterprocess-app:
   ribbon:
     listOfServers: crss2meterprocess-app.marathon.l4lb.thisdcos.directory:8081
@@ -43,10 +44,10 @@ crss-dataflow-app:
     listOfServers: crss2dataflow-app.marathon.l4lb.thisdcos.directory:8082
 crss-admin:
   ribbon:
-    listOfServers: crss1admin-service.marathon.l4lb.thisdcos.directory:8080
+    listOfServers: crssadmin-service.marathon.l4lb.thisdcos.directory:8080
 crss-reg:
   ribbon:
-    listOfServers: crss1registration-service.marathon.l4lb.thisdcos.directory:8080
+    listOfServers: crssregistration-service.marathon.l4lb.thisdcos.directory:8080
 crss-audit:
   ribbon:
     listOfServers: crss2audit.marathon.l4lb.thisdcos.directory:9094

ui-bsmd/application-dev2.yml

@@ -34,22 +34,22 @@ zuul:
 
 crss-meterprocess-app:
   ribbon:
-    listOfServers: crss-meterprocess-app.marathon.l4lb.thisdcos.directory:8081
+    listOfServers: crss2meterprocess-app.marathon.l4lb.thisdcos.directory:8081
 crss-settlement-app:
   ribbon:
-    listOfServers: crss-settlement-app.marathon.l4lb.thisdcos.directory:8082
+    listOfServers: crss2settlement-app.marathon.l4lb.thisdcos.directory:8082
 crss-dataflow-app:
   ribbon:
-    listOfServers: crss-dataflow-app.marathon.l4lb.thisdcos.directory:8082
+    listOfServers: crss2dataflow-app.marathon.l4lb.thisdcos.directory:8082
 crss-admin:
   ribbon:
-    listOfServers: crssadmin-service.marathon.l4lb.thisdcos.directory:8080
+    listOfServers: crss1admin-service.marathon.l4lb.thisdcos.directory:8080
 crss-reg:
   ribbon:
-    listOfServers: crssregistration-service.marathon.l4lb.thisdcos.directory:8080
+    listOfServers: crss1registration-service.marathon.l4lb.thisdcos.directory:8080
 crss-audit:
   ribbon:
-    listOfServers: crss-audit.marathon.l4lb.thisdcos.directory:9094
+    listOfServers: crss2audit.marathon.l4lb.thisdcos.directory:9094
 
 ribbon:
   ReadTimeout: 1440000