Add dcos profile for all services

application-dcos.yml

@@ -0,0 +1,4 @@
+spring:
+  rabbitmq:
+    host: rabbitmq.marathon.l4lb.thisdcos.directory
+security.server.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

application.yml

@@ -57,20 +57,4 @@ logging:
 ---
 spring:
   profiles: docker
-security.server.url: http://app:8080/admin
-
----
-spring:
-  profiles: dcos
-  rabbitmq:
-    host: rabbitmq.marathon.l4lb.thisdcos.directory
-security.server.url: http://phase1app.marathon.l4lb.thisdcos.directory:8080/admin
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://phase1discovery.marathon.l4lb.thisdcos.directory:8080/eureka/
-  instance:
-    prefer-ip-address: false
-    # HOST and PORT environment variable came from mesos as docker ENV
-    hostname: ${HOST}
-    noneSecurePort: ${PORT}
+security.server.url: http://app:8080/admin

crss-admin/crss-admin-dcos.yml

@@ -1,22 +1,10 @@
 spring:
   profiles:
-    include: embedded-ldap
+    include: ldap
   datasource:
-    platform : postgres
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_admin
+    url: jdbc:postgresql://192.168.233.9:5432/crss_admin
     username: crss_admin
     password: crss_admin
-    driverClassName: org.postgresql.Driver
-  jpa:
-    database: POSTGRESQL
-    show-sql: false
-    hibernate:
-      ddl-auto: none
-    properties:
-      hibernate:
-        dialect: org.hibernate.dialect.PostgreSQL94Dialect
-      jadira.usertype.autoRegisterUserTypes: true
-      javax.persistence.schema-generation.database.action: none
   mail:
     host: mailserver.marathon.l4lb.thisdcos.directory
     port: 3025
@@ -27,4 +15,6 @@ spring:
         transport.protocol: smtp
         smtp:
           auth: true
-          starttls.enable: true
+          starttls.enable: true
+  redis:
+    host: redis.marathon.l4lb.thisdcos.directory

crss-data/crss-data-dcos.yml

@@ -0,0 +1,11 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://192.168.233.9:5432/crss_data
+    username: crss_data
+    password: crss_data
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 5
+      minimumIdle: 2
+      idleTimeout: 180000 # 3 min
+      maxLifetime: 600000 # 10 min

crss-metering/crss-metering-dcos.yml

@@ -1,10 +1,9 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_metering_p1
+    url: jdbc:postgresql://192.168.233.9:5432/crss_metering
     username: crss_metering
     password: crss_metering
-    driverClassName: org.postgresql.Driver
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20

crss-reg/crss-reg-dcos.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://postgresql.marathon.l4lb.thisdcos.directory:5432/crss_registration
+    url: jdbc:postgresql://192.168.233.9:5432/crss_reg
     username: crss_reg
     password: crss_reg
 
@@ -18,3 +18,5 @@ crss:
       port: 22
       username: crss
       password: crss
+service:
+  admin.url: http://crssapplication-main-ui.marathon.l4lb.thisdcos.directory:8080/admin

crss-sched/crss-sched-dcos.yml

@@ -0,0 +1,11 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://192.168.233.9:5432/crss_sched
+    username: crss_sched
+    password: crss_sched
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 5
+      minimumIdle: 2
+      idleTimeout: 180000 # 3 min
+      maxLifetime: 600000 # 10 min

crss-ui/crss-ui-dcos.yml

@@ -0,0 +1,15 @@
+admin-service:
+  ribbon:
+    listOfServers: http://crssadmin-service.marathon.l4lb.thisdcos.directory:8080
+registration-service:
+  ribbon:
+    listOfServers: http://crssregistration-service.marathon.l4lb.thisdcos.directory:8080
+metering-service:
+  ribbon:
+    listOfServers: http://crssmetering-service.marathon.l4lb.thisdcos.directory:8080
+scheduler-service:
+  ribbon:
+    listOfServers: http://crssscheduler-service.marathon.l4lb.thisdcos.directory:8080
+data-extraction-service:
+  ribbon:
+    listOfServers: http://crssdata-extraction-service.marathon.l4lb.thisdcos.directory:8080