summaryrefslogtreecommitdiffstats
path: root/nokiav2/deployment/src/main
diff options
context:
space:
mode:
authorDenes Nemeth <denes.nemeth@nokia.com>2018-04-27 12:22:22 +0200
committerDenes Nemeth <denes.nemeth@nokia.com>2018-04-27 23:41:20 +0200
commit88a64ebf39dea43a4f0d69d18e5ab5933febea98 (patch)
tree5bafe04c3b2d0ce153beab0437440505d89b4d58 /nokiav2/deployment/src/main
parent2322725653143b3b8dd3b764273f5161c1f32104 (diff)
Fix component startup
Change-Id: Ia45d4a682f8faceb8c045ffedd7611bc61b21b7b Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com> Issue-ID: VFC-728
Diffstat (limited to 'nokiav2/deployment/src/main')
-rw-r--r--nokiav2/deployment/src/main/resources/application.properties23
-rwxr-xr-xnokiav2/deployment/src/main/resources/docker-entrypoint.sh7
2 files changed, 8 insertions, 22 deletions
diff --git a/nokiav2/deployment/src/main/resources/application.properties b/nokiav2/deployment/src/main/resources/application.properties
index d52ed498..299213d4 100644
--- a/nokiav2/deployment/src/main/resources/application.properties
+++ b/nokiav2/deployment/src/main/resources/application.properties
@@ -13,10 +13,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
###############################################################################
+
server.error.whitelabel.enabled=false
+
###############################################################################
-# Begining of mandatory properties #
+# Begin of mandatory properties #
###############################################################################
+
###############################################################################
# The following section contains the variables set during container creation #
# - all values must be replaced with non sample data #
@@ -26,23 +29,11 @@ server.error.whitelabel.enabled=false
driverMsbExternalIp=127.0.0.1
# the IP address of the server reported to the VNFM
driverVnfmExternalIp=127.0.0.1
-# the IP address of the message bus
-messageBusIp=127.0.0.1
-# the URL of the CBAM catalog service
-cbamCatalogUrl=https://127.0.0.1:443/api/catalog/adapter/
-# the URL of the CBAM LCN service
-cbamLcnUrl=https://127.0.0.1:443/vnfm/lcn/v3/
-# the URL of the CBAM authentication service
-cbamKeyCloakBaseUrl=https://127.0.0.1:443/auth/
-# the username to be used for requesing a token on CBAM authorization interface
-cbamUsername=kukuUser
-# the password to be used for requesing a token on CBAM authorization interface
-cbamPassword=kukuPassword
# the identifier of the VNFM in A&AI external system registry
vnfmId=5e65fe25-bdad-46dc-bba8-b7878fcee264
###############################################################################
-# The following section holds the default valued that may be chaged
+# The following section holds the default valued that may be changed
###############################################################################
# The TCP port of the server
server.port=8089
@@ -50,6 +41,8 @@ server.port=8089
server.context-path=
# the IP address to which the erver binds to
server.address=0.0.0.0
+# the IP address of the message bus
+messageBusIp=127.0.0.1
# the TCP port of the message bus
messageBusPort=80
# skip hostname verification during SSL on CBAM LCN, LCM and authorization interface
@@ -78,6 +71,7 @@ aaiPassword=AAI
sdcUsername=SDC
#The password to access SDC
sdcPassword=SDC
+
###############################################################################
# End of mandatory properties for driver #
###############################################################################
@@ -86,7 +80,6 @@ vnfmInfoCacheEvictionInMs=600000
## for logging begin ##
com.fasterxml.jackson.core=jackson-databind
-#logging.file=${catalina.base}/logs/vfcadaptor.log
logging.level.org.springframework=INFO
logging.level.org.hibernate=OFF
logging.level.org.springframework.web=DEBUG
diff --git a/nokiav2/deployment/src/main/resources/docker-entrypoint.sh b/nokiav2/deployment/src/main/resources/docker-entrypoint.sh
index bd36b617..79ccd05b 100755
--- a/nokiav2/deployment/src/main/resources/docker-entrypoint.sh
+++ b/nokiav2/deployment/src/main/resources/docker-entrypoint.sh
@@ -51,12 +51,6 @@ function configure(){
switchLine driverMsbExternalIp $EXTERNAL_IP
switchLine driverVnfmExternalIp $EXTERNAL_IP
switchLine messageBusIp $MSB_IP
- switchLine cbamCatalogUrl $CBAM_CATALOG_URL
- switchLine cbamLcnUrl $CBAM_LCN_URL
- switchLine cbamKeyCloakBaseUrl $CBAM_KEYCLOAK_URL
- switchLine cbamLcnUrl $CBAM_LCN_URL
- switchLine cbamUsername $CBAM_USERNAME
- switchLine cbamPassword $CBAM_PASSWORD
switchLine vnfmId $VNFM_ID
switchLine ipMap $IP_MAP
fi
@@ -82,4 +76,3 @@ while true ; do
done
echo "Server quit (unexpected)"
done
-