Externalized app params for deployment

- .env: contains environment variables which override application's default properties
- Dockerfile & docker-compose.yml: takes environment variables into account
- application.properties: included external services configurations

Change-Id: I49937e66d514a42a174cff3bf6c383ecfc8e28e0
Issue-ID: EXTAPI-49
Signed-off-by: Quoc Nghia Nguyen <quocnghia.nguyen@orange.com>

3 files changed, 39 insertions, 130 deletions

diff --git a/src/main/resources/application-docker.properties b/src/main/resources/application-docker.properties
deleted file mode 100644
index 098b43f..0000000
--- a/src/main/resources/application-docker.properties
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-#     Copyright (c) 2018 Orange
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-
-# LOGGING
-logging.level.org.onap.nbi=INFO
-
-# ONAP
-onap.lcpCloudRegionId=RegionOne
-onap.tenantId=31047205ce114b60833b23e400d6a535
-onap.cloudOwner=CloudOwner
-
-# NBI
-nbi.url=http://127.0.0.1:8080/nbi/api/v1
-nbi.callForVNF=false
-
-# SDC
-sdc.host=http://127.0.0.1:8090
-sdc.header.ecompInstanceId=Rene
-sdc.header.authorization=Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
-
-# AAI
-aai.host=http://127.0.0.1:8090
-aai.header.authorization=Basic QUFJOkFBSQ==
-aai.api.id=AAI
-
-# SO
-so.host=http://127.0.0.1:8090
-so.header.authorization=
-so.api.id=SO
-
-# MONGO
-spring.data.mongodb.uri=mongodb://mongo:27017/ServiceOrderDB
-
-# MYSQL
-spring.datasource.testWhileIdle=true
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb://mariadb:3306/nbi
-spring.jpa.show-sql=false
-spring.datasource.username=root
-spring.datasource.password=toto
-spring.jpa.hibernate.ddl-auto=create-drop
-spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
-
-# H2
-# spring.datasource.url=jdbc:h2:mem:~/db
-# spring.datasource.username=sa
-# spring.datasource.password=
-# spring.datasource.driver-class-name=org.h2.Driver
-# spring.h2.console.enabled=true
-# spring.h2.console.path=/h2-console
\ No newline at end of file
diff --git a/src/main/resources/application-localhost.properties b/src/main/resources/application-localhost.properties
deleted file mode 100644
index f542f60..0000000
--- a/src/main/resources/application-localhost.properties
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-#     Copyright (c) 2018 Orange
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-
-# LOGGING
-logging.level.org.onap.nbi=INFO
-
-# ONAP
-onap.lcpCloudRegionId=RegionOne
-onap.tenantId=31047205ce114b60833b23e400d6a535
-onap.cloudOwner=CloudOwner
-
-# NBI
-nbi.url=http://127.0.0.1:8080/nbi/api/v1
-nbi.callForVNF=false
-
-# SDC
-sdc.host=http://127.0.0.1:8090
-sdc.header.ecompInstanceId=Rene
-sdc.header.authorization=Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU=
-
-# AAI
-aai.host=http://127.0.0.1:8090
-aai.header.authorization=Basic QUFJOkFBSQ==
-aai.api.id=AAI
-
-# SO
-so.host=http://127.0.0.1:8090
-so.header.authorization=
-so.api.id=SO
-
-# MONGO
-spring.data.mongodb.host=localhost
-spring.data.mongodb.port=27017
-spring.data.mongodb.database=ServiceOrderDB
-
-# MYSQL
-spring.datasource.testWhileIdle=true
-spring.datasource.validationQuery=SELECT 1
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.url=jdbc:mariadb://localhost:3306/nbi
-spring.jpa.show-sql=false
-spring.datasource.username=root
-spring.datasource.password=toto
-spring.jpa.hibernate.ddl-auto=update
-spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
-
-# H2
-# spring.datasource.url=jdbc:h2:mem:~/db
-# spring.datasource.username=sa
-# spring.datasource.password=
-# spring.datasource.driver-class-name=org.h2.Driver
-# spring.h2.console.enabled=true
-# spring.h2.console.path=/h2-console
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4ddd54f..bb07e4d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -21,3 +21,42 @@ server.port = 8080
 # LOGGING
 logging.level.=INFO
 
+# ONAP
+onap.lcpCloudRegionId=
+onap.tenantId=
+onap.cloudOwner=
+
+# NBI
+nbi.url=http://localhost:8080/nbi/api/v1
+nbi.callForVNF=false
+
+# SDC
+sdc.host=http://localhost:8090
+sdc.header.ecompInstanceId=
+sdc.header.authorization=
+
+# AAI
+aai.host=http://localhost:8090
+aai.header.authorization=
+aai.api.id=AAI
+
+# SO
+so.host=http://localhost:8090
+so.header.authorization=
+so.api.id=SO
+
+# MONGO
+spring.data.mongodb.host=localhost
+spring.data.mongodb.port=27017
+spring.data.mongodb.database=ServiceOrderDB
+
+# MYSQL
+spring.datasource.url=jdbc:mariadb://localhost:3306/nbi
+spring.datasource.username=root
+spring.datasource.password=secret
+spring.datasource.testWhileIdle=true
+spring.datasource.validationQuery=SELECT 1
+spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
+spring.jpa.show-sql=false
+spring.jpa.hibernate.ddl-auto=update
+spring.jpa.hibernate.naming-strategy=org.hibernate.cfg.ImprovedNamingStrategy
\ No newline at end of file