diff options
| author |   Tal Gitelman <tg851x@intl.att.com> | 2017-10-03 15:03:25 +0300 |
|---|---|---|
| committer | Tal Gitelman <tg851x@intl.att.com> | 2017-10-03 15:03:25 +0300 |
| commit | 0a92119357a28bb8375cb1c8d520da191e6a5ca6 (patch) | |
| tree | 1cb5d8d4fdc6647549af377ca34a5851bb5f2e23 | |
| parent | 40af5a3c869313beb4ef0a324de89527a435e3dd (diff) | |
ONAP normative fixes
Change-Id: Ia70f81f6b0b352a75b66bc85f8402ee424ae6424
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py | 6 | ||||
| -rwxr-xr-x | sdc-os-chef/scripts/docker_run.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py index 78b257d6f3..3b4ed5463f 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py @@ -51,9 +51,9 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "subInterface", "contrailV2VLANSubInterface", "multiFlavorVFC", - "vnfConfiguration", - "underlayVpn", - "overlayTunnel" + "vnfConfiguration"#, + #"underlayVpn", + #"overlayTunnel" ] responseCodes = [200, 201] diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index d645f94b93..02eff2375f 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -147,7 +147,7 @@ docker run --detach --name sdc-FE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" # running healthCheck scripts echo "Running health checks, please wait..." echo "" -c=25 # seconds to wait +c=30 # seconds to wait REWRITE="\e[45D\e[1A\e[K" while [ $c -gt 0 ]; do c=$((c-1)) |