diff options
| author |   Michael Lando <ml636r@att.com> | 2017-02-20 19:39:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@openecomp.org> | 2017-02-20 19:39:23 +0000 |
| commit | f4092b589e2d738c26e166cb018a99b78c8a6da3 (patch) | |
| tree | d4bed9944fe81950d9afcf1a17517d2e90be43b3 /sdc-os-chef/scripts | |
| parent | 3d35bb381713a3d5ccb7eea0c34a59188c0a51fc (diff) | |
| parent | 0649e652577e96db0efc80bafec0bdd21518d0b8 (diff) | |
Merge "Fix UI and docker"
Diffstat (limited to 'sdc-os-chef/scripts')
| -rw-r--r-- | sdc-os-chef/scripts/docker_clean.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/docker_health.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/docker_login.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/docker_run.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/docker_stats.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/docker_watchdog.sh | 1 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/restart_docker.sh | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/sdc-os-chef/scripts/docker_clean.sh b/sdc-os-chef/scripts/docker_clean.sh index 0b2227d45a..6fe1ff615d 100644 --- a/sdc-os-chef/scripts/docker_clean.sh +++ b/sdc-os-chef/scripts/docker_clean.sh @@ -4,3 +4,4 @@ for X in ${docker_ids} do docker rm -f ${X} done + diff --git a/sdc-os-chef/scripts/docker_health.sh b/sdc-os-chef/scripts/docker_health.sh index 6fdf826084..832b25a237 100644 --- a/sdc-os-chef/scripts/docker_health.sh +++ b/sdc-os-chef/scripts/docker_health.sh @@ -20,3 +20,4 @@ then exit ${res} fi echo "check user existance: OK" + diff --git a/sdc-os-chef/scripts/docker_login.sh b/sdc-os-chef/scripts/docker_login.sh index 15544f4d24..6309fda20e 100644 --- a/sdc-os-chef/scripts/docker_login.sh +++ b/sdc-os-chef/scripts/docker_login.sh @@ -6,3 +6,4 @@ if [ -z "$docker_ids" ]; then else docker exec -it ${docker_ids} bash fi + diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index 1b3f370d27..dcc603c154 100644 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -126,3 +126,4 @@ echo -e "" if [ $? -ne 0 ]; then exit 1 fi + diff --git a/sdc-os-chef/scripts/docker_stats.sh b/sdc-os-chef/scripts/docker_stats.sh index 9258b3471d..0047fe4df0 100644 --- a/sdc-os-chef/scripts/docker_stats.sh +++ b/sdc-os-chef/scripts/docker_stats.sh @@ -34,3 +34,4 @@ grep -v "^\-" ${FILE} |grep -v ^CONT| awk 'BEGIN { print $1" "d" "$3" "$8 next }' > `echo ${FILE}|awk -F"." '{ print $1".csv"}'` + diff --git a/sdc-os-chef/scripts/docker_watchdog.sh b/sdc-os-chef/scripts/docker_watchdog.sh index cc8452537b..cd6d3f3210 100644 --- a/sdc-os-chef/scripts/docker_watchdog.sh +++ b/sdc-os-chef/scripts/docker_watchdog.sh @@ -41,3 +41,4 @@ else docker pull ecomp-nexus:51212/ecomp/sdc-frontend:${RELEASE} docker run --detach --name sdc-FE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 2g --memory-swap=2g --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/ASDC/logs/FE/:/var/lib/jetty/logs --volume /data/ASDC/environments:/root/chef-solo/environments --publish 9443:9443 --publish 8181:8181 ecomp-nexus:51212/ecomp/sdc-frontend:${RELEASE} fi + diff --git a/sdc-os-chef/scripts/restart_docker.sh b/sdc-os-chef/scripts/restart_docker.sh index 619f51af5c..8c645662a6 100644 --- a/sdc-os-chef/scripts/restart_docker.sh +++ b/sdc-os-chef/scripts/restart_docker.sh @@ -95,3 +95,4 @@ case ${DOCKER} in docker run --detach --name sdc-FE --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 2g --memory-swap=2g --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/FE/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 9443:9443 --publish 8181:8181 ecomp-nexus:${PORT}/ecomp/sdc-frontend:${RELEASE} ;; esac + |