#199: move vault host config from docker to main profile (#192)

maryarm · web-flow · commit e4cba7c40dca · 2022-02-05T15:44:59.000+03:30
diff --git a/accountant/accountant-app/src/main/resources/application-docker.yml b/accountant/accountant-app/src/main/resources/application-docker.yml
@@ -8,8 +8,6 @@ spring:
     username: ${dbusername}
     password: ${dbpassword}
   cloud:
-    vault:
-      host: ${VAULT_HOST}
     consul:
       host: ${CONSUL_HOST}
   main:
diff --git a/accountant/accountant-app/src/main/resources/application.yml b/accountant/accountant-app/src/main/resources/application.yml
@@ -25,7 +25,7 @@ spring:
     bootstrap:
       enabled: true
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
diff --git a/api/api-app/src/main/resources/application-docker.yml b/api/api-app/src/main/resources/application-docker.yml
@@ -8,8 +8,6 @@ spring:
     username: ${dbusername}
     password: ${dbpassword}
   cloud:
-    vault:
-      host: ${VAULT_HOST}
     consul:
       host: ${CONSUL_HOST}
       port: 8500
diff --git a/api/api-app/src/main/resources/application.yml b/api/api-app/src/main/resources/application.yml
@@ -25,7 +25,7 @@ spring:
     bootstrap:
       enabled: true
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
diff --git a/bc-gateway/bc-gateway-app/src/main/resources/application-docker.yml b/bc-gateway/bc-gateway-app/src/main/resources/application-docker.yml
@@ -13,8 +13,6 @@ spring:
     password: ${dbpassword}
     initialization-mode: always
   cloud:
-    vault:
-      host: ${VAULT_HOST}
     consul:
       host: ${CONSUL_HOST}
       port: 8500
diff --git a/bc-gateway/bc-gateway-app/src/main/resources/application.yml b/bc-gateway/bc-gateway-app/src/main/resources/application.yml
@@ -20,7 +20,7 @@ spring:
     bootstrap:
       enabled: true
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
diff --git a/eventlog/eventlog-app/src/main/resources/application-docker.yml b/eventlog/eventlog-app/src/main/resources/application-docker.yml
@@ -8,7 +8,4 @@ spring:
     url: r2dbc:postgresql://${DB_IP_PORT}/opex_eventlog
     username: ${dbusername}
     password: ${dbpassword}
-    initialization-mode: always
-  cloud:
-    vault:
-      host: ${VAULT_HOST}
+    initialization-mode: always
diff --git a/eventlog/eventlog-app/src/main/resources/application.yml b/eventlog/eventlog-app/src/main/resources/application.yml
@@ -15,7 +15,7 @@ spring:
     initialization-mode: always
   cloud:
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
diff --git a/user-management/keycloak-gateway/src/main/resources/application-docker.yml b/user-management/keycloak-gateway/src/main/resources/application-docker.yml
@@ -6,8 +6,6 @@ spring:
     username: ${dbusername}
     password: ${dbpassword}
   cloud:
-    vault:
-      host: ${VAULT_HOST}
     consul:
       host: ${CONSUL_HOST}
       port: 8500
diff --git a/user-management/keycloak-gateway/src/main/resources/application.yml b/user-management/keycloak-gateway/src/main/resources/application.yml
@@ -26,7 +26,7 @@ spring:
     bootstrap:
       enabled: true
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
diff --git a/wallet/wallet-app/src/main/resources/application-docker.yml b/wallet/wallet-app/src/main/resources/application-docker.yml
@@ -13,8 +13,6 @@ spring:
     password: ${dbpassword}
     initialization-mode: always
   cloud:
-    vault:
-      host: ${VAULT_HOST}
     consul:
       host: ${CONSUL_HOST}
       port: 8500
diff --git a/wallet/wallet-app/src/main/resources/application.yml b/wallet/wallet-app/src/main/resources/application.yml
@@ -21,7 +21,7 @@ spring:
     bootstrap:
       enabled: true
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
diff --git a/websocket/websocket-app/src/main/resources/application-docker.yml b/websocket/websocket-app/src/main/resources/application-docker.yml
@@ -8,8 +8,6 @@ spring:
     username: ${dbusername}
     password: ${dbpassword}
   cloud:
-    vault:
-      host: ${VAULT_HOST}
     consul:
       host: ${CONSUL_HOST}
       port: 8500
diff --git a/websocket/websocket-app/src/main/resources/application.yml b/websocket/websocket-app/src/main/resources/application.yml
@@ -19,7 +19,7 @@ spring:
     bootstrap:
       enabled: true
     vault:
-      host: localhost
+      host: ${VAULT_HOST}
       port: 8200
       scheme: http
       authentication: APPID
