summaryrefslogtreecommitdiffstats
path: root/cps-application
diff options
context:
space:
mode:
authorClaudio D. Gasparini <claudio.gasparini@pantheon.tech>2021-02-04 09:33:28 +0100
committerClaudio D. Gasparini <claudio.gasparini@pantheon.tech>2021-02-04 12:58:14 +0100
commitb1ccfce0b229d544bf08b1c197a2365b40369796 (patch)
treefd803e64387205147eda40668532a1aa053f7376 /cps-application
parent1540a5809fff8477bfdb6f43fd6c475cf13c6d71 (diff)
Decouple application configuration file
Agreement is that application configuration should live on OOM - leave an example of the configuration file under docker compose to run locally, instead of use OOM. Mainly for devs - document on README how to run the app with IDE or with docker compose - remove duplicate code on poms Issue-ID: CPS-175 Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech> Change-Id: I328e89dba78cdf4d8abab51e3be5cb6d641064db
Diffstat (limited to 'cps-application')
-rw-r--r--cps-application/pom.xml29
-rw-r--r--cps-application/src/main/resources/application.yml51
2 files changed, 4 insertions, 76 deletions
diff --git a/cps-application/pom.xml b/cps-application/pom.xml
index a159ad883a..744efb2d2f 100644
--- a/cps-application/pom.xml
+++ b/cps-application/pom.xml
@@ -68,6 +68,10 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -76,21 +80,12 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>cps-rest</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<id>xnf-docker</id>
@@ -109,14 +104,6 @@
<artifactId>cps-nf-proxy-rest</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<id>cps-xnf-docker</id>
@@ -139,14 +126,6 @@
<artifactId>cps-nf-proxy-rest</artifactId>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.google.cloud.tools</groupId>
- <artifactId>jib-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</profile>
</profiles>
</project> \ No newline at end of file
diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml
deleted file mode 100644
index c3ceecde0a..0000000000
--- a/cps-application/src/main/resources/application.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-server:
- port: 8080
-
-rest:
- api:
- cps-base-path: /cps/api
- xnf-base-path: /cps-nf-proxy/api
-
-spring:
- main:
- banner-mode: "off"
- jpa:
- ddl-auto: create
- open-in-view: false
- properties:
- hibernate:
- enable_lazy_load_no_trans: true
- dialect: org.hibernate.dialect.PostgreSQLDialect
-
- datasource:
- url: jdbc:postgresql://${DB_HOST}:5432/cpsdb
- username: ${DB_USERNAME}
- password: ${DB_PASSWORD}
- driverClassName: org.postgresql.Driver
- initialization-mode: always
-
- cache:
- type: caffeine
- cache-names: yangSchema
- caffeine:
- spec: maximumSize=10000,expireAfterAccess=10m
-# Actuator
-management:
- endpoints:
- web:
- base-path: /manage
- exposure:
- include: info,health,loggers
- endpoint:
- health:
- show-details: always
- # kubernetes probes: liveness and readiness
- probes:
- enabled: true
- loggers:
- enabled: true
-
-logging:
- level:
- org:
- springframework: INFO