From d3226d1ee1af57723cc37580f360fa99cf8e5fbf Mon Sep 17 00:00:00 2001
From: maryarm <maryam@nilin.co>
Date: Sat, 5 Feb 2022 13:09:43 +0100
Subject: [PATCH] #199: move vault host config from docker to main profile

---
 .../accountant-app/src/main/resources/application-docker.yml | 2 --
 accountant/accountant-app/src/main/resources/application.yml | 2 +-
 api/api-app/src/main/resources/application-docker.yml        | 2 --
 api/api-app/src/main/resources/application.yml               | 2 +-
 .../bc-gateway-app/src/main/resources/application-docker.yml | 2 --
 bc-gateway/bc-gateway-app/src/main/resources/application.yml | 2 +-
 .../eventlog-app/src/main/resources/application-docker.yml   | 5 +----
 eventlog/eventlog-app/src/main/resources/application.yml     | 2 +-
 .../src/main/resources/application-docker.yml                | 2 --
 .../keycloak-gateway/src/main/resources/application.yml      | 2 +-
 wallet/wallet-app/src/main/resources/application-docker.yml  | 2 --
 wallet/wallet-app/src/main/resources/application.yml         | 2 +-
 .../websocket-app/src/main/resources/application-docker.yml  | 2 --
 websocket/websocket-app/src/main/resources/application.yml   | 2 +-
 14 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/accountant/accountant-app/src/main/resources/application-docker.yml b/accountant/accountant-app/src/main/resources/application-docker.yml
index c2befb6e8..69b3494a3 100644
--- 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
index 8ff1a51dd..dcfce0a97 100644
--- 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
index fa49707cd..c6b288905 100644
--- 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
index aa3103dae..1477c7326 100644
--- 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
index 81b423781..883e59f1f 100644
--- 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
index 19fc15ebe..ca8b0c2b1 100644
--- 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
index 6507116a0..716f4321b 100644
--- 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}
\ No newline at end of file
+    initialization-mode: always
\ No newline at end of file
diff --git a/eventlog/eventlog-app/src/main/resources/application.yml b/eventlog/eventlog-app/src/main/resources/application.yml
index 86b56d4eb..e7eef4ba9 100644
--- 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
index 3c3eb5f92..1577e9a17 100644
--- 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
index 9f0b97287..948f806b7 100644
--- 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
index 32de0c06b..cfe2c461e 100644
--- 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
index d89f4c3bf..6c62e4237 100644
--- 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
index 1125c565d..0d95fa115 100644
--- 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
index 147c26f04..0ee7d3714 100644
--- 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