diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-03 12:09:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-03 12:09:16 +0000 |
| commit | 689455b6a32cba3e7a7d37dab30ad386037891ee (patch) | |
| tree | bc4d319854c3dceb52470c4ac9ffd5f4a5eed8e6 | |
| parent | a51a886ba196336d958445b07b0011186dab4a6a (diff) | |
| parent | 0a92119357a28bb8375cb1c8d520da191e6a5ca6 (diff) | |
Merge "ONAP normative fixes"
| -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)) |