Browse Source

config sync

Jann 4 years ago
parent
commit
c4908334f7
25 changed files with 127 additions and 129 deletions
  1. 1 1
      crss-admin/crss-admin-pemc-dev.yml
  2. 2 2
      crss-audit/crss-audit-pemc-dev.yml
  3. 14 14
      crss-data/crss-data-pemc-dev.yml
  4. 2 3
      crss-dataflow-app/crss-dataflow-app-pemc-dev.yml
  5. 1 1
      crss-datainterface-app/crss-datainterface-app-pemc-dev.yml
  6. 7 7
      crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-dev.yml
  7. 1 1
      crss-metering/crss-metering-pemc-dev.yml
  8. 3 3
      crss-meterprocess-app/crss-meterprocess-app-pemc-dev.yml
  9. 3 3
      crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-dev.yml
  10. 12 12
      crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-dev.yml
  11. 3 3
      crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-dev.yml
  12. 4 4
      crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-dev.yml
  13. 17 17
      crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-dev.yml
  14. 7 7
      crss-mq-computation/crss-mq-computation-pemc-dev.yml
  15. 6 6
      crss-mtr/crss-mtr-pemc-dev.yml
  16. 6 6
      crss-reg/crss-reg-pemc-dev.yml
  17. 1 1
      crss-sched/crss-sched-pemc-dev.yml
  18. 3 3
      crss-settlement-app/crss-settlement-app-pemc-dev.yml
  19. 8 8
      crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-dev.yml
  20. 7 7
      crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-dev.yml
  21. 4 4
      crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-dev.yml
  22. 4 5
      crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-dev.yml
  23. 6 6
      crss-settlement-task-validation/crss-settlement-task-validation-pemc-dev.yml
  24. 1 1
      crss-uaa/crss-uaa-pemc-dev.yml
  25. 4 4
      crss-worklist-app/crss-worklist-app-pemc-dev.yml

+ 1 - 1
crss-admin/crss-admin-pemc-dev.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=admin
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=admin
     username: crss_admin
     password: YReYA7fI
   mail:

+ 2 - 2
crss-audit/crss-audit-pemc-dev.yml

@@ -2,6 +2,6 @@ spring:
   crss-audit:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=audit
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=audit
       username: crss_audit
-      password: S0CuFyj6
+      password: S0CuFyj6

+ 14 - 14
crss-data/crss-data-pemc-dev.yml

@@ -1,20 +1,20 @@
 spring:
   datasource:
     driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataextraction
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataextraction
     username: crss_dataextraction
     password: xgZx2FqM
 crss:
   metadata:
     datasource:
       driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataextraction
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataextraction
       username: crss_dataextraction
       password: xgZx2FqM
   datawarehouse:
     datasource:
       platform: postgresql
-      url: jdbc:postgresql://192.168.1.120:5432/crss_external?currentSchema=datawarehouse
+      url: jdbc:postgresql://192.168.10.190:5432/crss_external?currentSchema=datawarehouse
       username: crss_datawarehouse
       password: 8BE7ShE3
       driverClassName: org.postgresql.Driver
@@ -23,14 +23,14 @@ crss:
         maximumPoolSize: 5
         minimumIdle: 2
   registration:
-     datasource:
-       driverClassName: org.postgresql.Driver
-       url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
-       username: crss_registration
-       password: 51UF3JA9
-       hikari:
-         connectionTimeout: 10000
-         maximumPoolSize: 5
-         minimumIdle: 2
-         idleTimeout: 180000 # 3 min
-         maxLifetime: 600000 # 10 min
+    datasource:
+      driverClassName: org.postgresql.Driver
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      hikari:
+        connectionTimeout: 10000
+        maximumPoolSize: 5
+        minimumIdle: 2
+        idleTimeout: 180000 # 3 min
+        maxLifetime: 600000 # 10 min

+ 2 - 3
crss-dataflow-app/crss-dataflow-app-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -48,5 +48,4 @@ scheduler:
     runRcoa: 480
     finalizeStlReady: 480
     genMqReport: 480
-    genMtr: 480
-
+    genMtr: 480

+ 1 - 1
crss-datainterface-app/crss-datainterface-app-pemc-dev.yml

@@ -2,7 +2,7 @@ spring:
   crss-nmms:
     datasource:
       driverClassName: "${spring.datasource.driverClassName}"
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
 

+ 7 - 7
crss-datainterface-task-ingest/crss-datainterface-task-ingest-pemc-dev.yml

@@ -2,36 +2,36 @@ spring:
   crss-emdb:
     datasource:
       driverClassName: org.postgresql.Driver
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss_external?currentSchema=emdb
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss_external?currentSchema=emdb
       username: postgres
       password: postgres
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-scheduler:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=scheduler
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=scheduler
       username: crss_uat_user
       password: f2aB2NkF
       driverClassName: org.postgresql.Driver
@@ -41,4 +41,4 @@ sftp:
     username: pemc
     password: 123qwe
     host: sftp.marathon.l4lb.thisdcos.directory
-    port: 22
+    port: 22

+ 1 - 1
crss-metering/crss-metering-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   profiles.include: pg-query
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     hikari:

+ 3 - 3
crss-meterprocess-app/crss-meterprocess-app-pemc-dev.yml

@@ -2,19 +2,19 @@ spring:
   crss-main:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
   crss-registration:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
   crss-nmms:
     datasource:
       driverClassName: ${spring.datasource.driverClassName}
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
 

+ 3 - 3
crss-meterprocess-stream-daily-sink/crss-meterprocess-stream-daily-sink-pemc-dev.yml

@@ -1,19 +1,19 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

+ 12 - 12
crss-meterprocess-stream-mapper/crss-meterprocess-stream-mapper-pemc-dev.yml

@@ -6,7 +6,7 @@ spring:
           content-type: application/json
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
@@ -15,7 +15,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -24,17 +24,17 @@ spring:
       validation-query: SELECT 1
 
   jpa:
-      show-sql: false
+    show-sql: false
+    hibernate:
+      ddl-auto: none
+    properties:
       hibernate:
-        ddl-auto: none
-      properties:
-        hibernate:
-          dialect: org.hibernate.dialect.PostgreSQLDialect
-          namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
-          hbm2ddl:
-            auto: none
-          temp:
-            use_jdbc_metadata_defaults: false
+        dialect: org.hibernate.dialect.PostgreSQLDialect
+        namingStrategy: org.hibernate.cfg.ImprovedNamingStrategy
+        hbm2ddl:
+          auto: none
+        temp:
+          use_jdbc_metadata_defaults: false
 logging:
   level:
     com.pemc: debug

+ 3 - 3
crss-meterprocess-stream-processor-daily-validate/crss-meterprocess-stream-processor-daily-validate-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

+ 4 - 4
crss-meterprocess-stream-source-daily-raw/crss-meterprocess-stream-source-daily-raw-pemc-dev.yml

@@ -2,7 +2,7 @@
 spring:
   profiles: dailyExtract
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
@@ -32,7 +32,7 @@ logging:
 spring:
   profiles: monthlyExtract
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
@@ -61,7 +61,7 @@ logging:
 # default
 spring:
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
     username: crss_metering
     password: Fh7UcXpW
     driver-class-name: org.postgresql.Driver
@@ -83,4 +83,4 @@ trigger:
 
 logging:
   level:
-    com.pemc: DEBUG
+    com.pemc: DEBUG

+ 17 - 17
crss-meterprocess-task-stlready/crss-meterprocess-task-stlready-pemc-dev.yml

@@ -1,35 +1,35 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-nmms:
-      datasource:
-        jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
-        url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
-        username: crss_nmms
-        password: lbgg1i2Y
-        driverClassName: org.postgresql.Driver
+    datasource:
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      username: crss_nmms
+      password: lbgg1i2Y
+      driverClassName: org.postgresql.Driver
   crss-registration:
-      dataSource:
-        jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
-        url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
-        username: crss_registration
-        password: 51UF3JA9
-        driverClassName: org.postgresql.Driver
-        maxPoolSize: 5
-        test-on-borrow: true
-        validation-query: SELECT 1
+    dataSource:
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      username: crss_registration
+      password: 51UF3JA9
+      driverClassName: org.postgresql.Driver
+      maxPoolSize: 5
+      test-on-borrow: true
+      validation-query: SELECT 1
 
   profiles:
     include: mesos

+ 7 - 7
crss-mq-computation/crss-mq-computation-pemc-dev.yml

@@ -1,8 +1,8 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -11,8 +11,8 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -21,8 +21,8 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
@@ -104,4 +104,4 @@ spring:
 spring:
   profiles: dailyMqReport
   cloud.deployer.mesos.chronos.constraints:
----
+---

+ 6 - 6
crss-mtr/crss-mtr-pemc-dev.yml

@@ -1,8 +1,8 @@
 spring:
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -11,8 +11,8 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -21,8 +21,8 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
-      url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
+      url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

+ 6 - 6
crss-reg/crss-reg-pemc-dev.yml

@@ -1,33 +1,33 @@
 spring:
   datasource:
     driverClassName: org.postgresql.Driver
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
     username: crss_registration
     password: 51UF3JA9
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
   crss-meterprocess:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
   crss-admin:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=admin
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=admin
       username: crss_admin
       password: YReYA7fI
   xdf-control:
     datasource:
       driverClassName: org.postgresql.Driver
-      url: jdbc:postgresql://192.168.1.120:5432/crss_external?currentSchema=xdfcontrol
+      url: jdbc:postgresql://192.168.10.190:5432/crss_external?currentSchema=xdfcontrol
       username: crss_xdfcontrol
       password: crss_xdfcontrol
 

+ 1 - 1
crss-sched/crss-sched-pemc-dev.yml

@@ -1,6 +1,6 @@
 spring:
   profiles.include: metronome
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=scheduler
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=scheduler
     username: crss_scheduler
     password: 5Q4AY59T

+ 3 - 3
crss-settlement-app/crss-settlement-app-pemc-dev.yml

@@ -1,19 +1,19 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-worklist:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=worklist
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=worklist
       username: crss_worklist
       password: c3XL8Lcb
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver

+ 8 - 8
crss-settlement-task-calculation-addtlcomp/crss-settlement-task-calculation-addtlcomp-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
@@ -28,7 +28,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
@@ -37,7 +37,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -46,12 +46,12 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
   profiles:
-      include: mesos
+    include: mesos
   cloud:
     deployer:
       mesos:
@@ -85,4 +85,4 @@ logging:
     com.pemc.crss.settlement.task.calculation.addtlcomp: DEBUG
     com.netflix: DEBUG
     org.springframework.cloud: DEBUG
-    org.hibernate.stat: debug
+    org.hibernate.stat: debug

+ 7 - 7
crss-settlement-task-calculation/crss-settlement-task-calculation-pemc-dev.yml

@@ -1,7 +1,7 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
@@ -10,7 +10,7 @@ spring:
       validation-query: SELECT 1
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
@@ -19,7 +19,7 @@ spring:
       validation-query: SELECT 1
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
@@ -28,7 +28,7 @@ spring:
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
@@ -37,7 +37,7 @@ spring:
       validation-query: SELECT 1
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       driverClassName: org.postgresql.Driver
@@ -47,7 +47,7 @@ spring:
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
@@ -130,4 +130,4 @@ spring:
 spring:
   profiles: dailyLrCalculation
   cloud.deployer.mesos.chronos.constraints:
----
+---

+ 4 - 4
crss-settlement-task-file-gen-addtlcomp/crss-settlement-task-file-gen-addtlcomp-pemc-dev.yml

@@ -1,26 +1,26 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver

+ 4 - 5
crss-settlement-task-invoice-generation/crss-settlement-task-invoice-generation-pemc-dev.yml

@@ -1,26 +1,26 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       maximumPoolSize: 5
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
@@ -43,4 +43,3 @@ batch:
     lr: 15
     energyStlB: 150000
     spotLlccStl: 16
-

+ 6 - 6
crss-settlement-task-validation/crss-settlement-task-validation-pemc-dev.yml

@@ -1,37 +1,37 @@
 spring:
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-metering:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=metering
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=metering
       username: crss_metering
       password: Fh7UcXpW
       driverClassName: org.postgresql.Driver
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=nmms
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=nmms
       username: crss_nmms
       password: lbgg1i2Y
       driverClassName: org.postgresql.Driver
   crss-dataflow:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=dataflow
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=dataflow
       username: crss_dataflow
       password: lgcCpwy0
       maximumPoolSize: 5

+ 1 - 1
crss-uaa/crss-uaa-pemc-dev.yml

@@ -2,7 +2,7 @@ spring:
   redis:
     database: 2
   datasource:
-    url: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=admin
+    url: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=admin
     username: crss_admin
     password: YReYA7fI
 

+ 4 - 4
crss-worklist-app/crss-worklist-app-pemc-dev.yml

@@ -1,25 +1,25 @@
 spring:
   crss-worklist:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=worklist
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=worklist
       username: crss_worklist
       password: c3XL8Lcb
       driverClassName: org.postgresql.Driver
   crss-stl:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=settlement
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=settlement
       username: crss_settlement
       password: i17SMOPm
       driverClassName: org.postgresql.Driver
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=meterprocess
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=meterprocess
       username: crss_meterprocess
       password: D9JpfUtT
       driverClassName: org.postgresql.Driver
   crss-registration:
     dataSource:
-      jdbcUrl: jdbc:postgresql://192.168.1.120:5432/crss?currentSchema=registration
+      jdbcUrl: jdbc:postgresql://192.168.10.190:5432/crss?currentSchema=registration
       username: crss_registration
       password: 51UF3JA9
       driverClassName: org.postgresql.Driver