aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGitelman, Tal (tg851x) <tg851x@intl.att.com>2018-03-21 17:42:47 +0200
committerTal Gitelman <tg851x@intl.att.com>2018-03-21 15:43:43 +0000
commit6a1b82aa42d2bf7abcc2b3ab276feb3211c647c4 (patch)
treec6efc586beb08f1a97943b334d73f114643372e4
parent84f69f366eef1a33472145db98e0e2983d3503fa (diff)
Onap normatives are imported always
Change-Id: I33b05ae29bc41ed90a87cf01960a848f2484200d Issue-ID: SDC-1103 Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py6
-rwxr-xr-xsdc-os-chef/scripts/docker_run.sh2
2 files changed, 4 insertions, 4 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py
index 5c57762c61..289678b369 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py
@@ -27,7 +27,7 @@ import importCommon
# python upgradeNormative.py [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] #
# #
# #
-# shortest activation (be host = localhost, be port = 8080, user = jh0003): # # #
+# shortest activation (be host = localhost, be port = 8080, user = jh0003): #
# python upgradeNormative.py #
# #
#################################################################################################################################################################################################
@@ -123,13 +123,13 @@ def main(argv):
handleResults(resultsHeat)
resultsHeat = upgradeNfvTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion)
- handleResults(resultsHeat)
+ handleResults(resultsHeat)
resultsHeat = upgradeOnapTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion)
handleResults(resultsHeat)
resultsHeat = upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion)
- handleResults(resultsHeat)
+ handleResults(resultsHeat)
errorAndExit(0, None)
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh
index 1be066b021..d6bce35491 100755
--- a/sdc-os-chef/scripts/docker_run.sh
+++ b/sdc-os-chef/scripts/docker_run.sh
@@ -323,7 +323,7 @@ function sdc-kbn {
echo "docker run sdc-kibana..."
if [ ${LOCAL} = false ]; then
docker pull ${PREFIX}/sdc-kibana:${RELEASE}
-docker run --detach --name sdc-kbn --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5601:5601 ${PREFIX}/sdc-kibana:${RELEASE}
+docker run --detach --name sdc-kbn --env ENVNAME="${DEP_ENV}" --env NODE_OPTIONS="--max-old-space-size=200" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 5601:5601 ${PREFIX}/sdc-kibana:${RELEASE}
fi
}