Merge "Load CMP Servers config from volume"

2 files changed, 7 insertions, 26 deletions

diff --git a/certService/src/main/resources/application.properties b/certService/src/main/resources/application.properties
index b9ce108a..eab43c08 100644
--- a/certService/src/main/resources/application.properties
+++ b/certService/src/main/resources/application.properties
@@ -1,5 +1,10 @@
-#Actuator properties
+# Actuator configuration
 management.endpoints.enabled-by-default=false
 management.endpoint.health.enabled=true
-springdoc.swagger-ui.path=/docs
 springdoc.show-actuator=true
+
+# Swagger configuration
+springdoc.swagger-ui.path=/docs
+
+# AAF CertService app specific configuration
+app.config.path=/etc/onap/aaf/certservice
\ No newline at end of file
diff --git a/certService/src/main/resources/cmpServers.json b/certService/src/main/resources/cmpServers.json
deleted file mode 100644
index ee9e72b9..00000000
--- a/certService/src/main/resources/cmpServers.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "cmpv2Servers": [
-    {
-      "caName": "TEST",
-      "url": "http://127.0.0.1/ejbca/publicweb/cmp/cmp",
-      "issuerDN": "CN=ManagementCA",
-      "caMode": "CLIENT",
-      "authentication": {
-        "iak": "xxx",
-        "rv": "yyy"
-      }
-    },
-    {
-      "caName": "TEST2",
-      "url": "http://127.0.0.1/ejbca/publicweb/cmp/cmpRA",
-      "issuerDN": "CN=ManagementCA2",
-      "caMode": "RA",
-      "authentication": {
-        "iak": "xxx",
-        "rv": "yyy"
-      }
-    }
-  ]
-}
\ No newline at end of file