diff options
author | ml636r <ml636r@att.com> | 2017-02-20 21:10:54 +0200 |
---|---|---|
committer | ml636r <ml636r@att.com> | 2017-02-20 21:10:54 +0200 |
commit | 0649e652577e96db0efc80bafec0bdd21518d0b8 (patch) | |
tree | 201ac06ed1fb115ea73c9368fddfa08685b6afb4 /sdc-os-chef | |
parent | 30e7cdaf4621e20ff2a2e2d81ec870c41d1d5e1f (diff) |
Fix UI and docker
Change-Id: I5ac193d7382a59df64a1e56e5b0388915e3f9a13
Signed-off-by: ml636r <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef')
-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 | ||||
-rw-r--r-- | sdc-os-chef/sdc-backend/startup.sh | 1 | ||||
-rw-r--r-- | sdc-os-chef/sdc-cassandra/startup.sh | 1 | ||||
-rw-r--r-- | sdc-os-chef/sdc-elasticsearch/startup.sh | 1 | ||||
-rw-r--r-- | sdc-os-chef/sdc-frontend/startup.sh | 1 | ||||
-rw-r--r-- | sdc-os-chef/sdc-kibana/startup.sh | 1 | ||||
-rw-r--r-- | sdc-os-chef/sdc-sanity/startup.sh | 1 |
13 files changed, 13 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 + diff --git a/sdc-os-chef/sdc-backend/startup.sh b/sdc-os-chef/sdc-backend/startup.sh index d795ddde67..7edc7a131a 100644 --- a/sdc-os-chef/sdc-backend/startup.sh +++ b/sdc-os-chef/sdc-backend/startup.sh @@ -38,3 +38,4 @@ else fi while true; do sleep 2; done + diff --git a/sdc-os-chef/sdc-cassandra/startup.sh b/sdc-os-chef/sdc-cassandra/startup.sh index 61a5109fa1..2bfee3211c 100644 --- a/sdc-os-chef/sdc-cassandra/startup.sh +++ b/sdc-os-chef/sdc-cassandra/startup.sh @@ -25,3 +25,4 @@ cd /tmp/ while true; do sleep 2; done + diff --git a/sdc-os-chef/sdc-elasticsearch/startup.sh b/sdc-os-chef/sdc-elasticsearch/startup.sh index b9e5fd6edf..0a602ade56 100644 --- a/sdc-os-chef/sdc-elasticsearch/startup.sh +++ b/sdc-os-chef/sdc-elasticsearch/startup.sh @@ -17,3 +17,4 @@ chef-solo -c solo.rb -o recipe[sdc-elasticsearch::ES_5_create_monitoring_templat chef-solo -c solo.rb -o recipe[sdc-elasticsearch::ES_6_create_kibana_dashboard_virtualization] while true; do sleep 2; done + diff --git a/sdc-os-chef/sdc-frontend/startup.sh b/sdc-os-chef/sdc-frontend/startup.sh index 2a3d4d47f5..ee6e7f528a 100644 --- a/sdc-os-chef/sdc-frontend/startup.sh +++ b/sdc-os-chef/sdc-frontend/startup.sh @@ -10,3 +10,4 @@ sed -i '/^set -e/aTMPDIR=${JETTY_BASE}\/temp' /docker-entrypoint.sh cd /var/lib/jetty /docker-entrypoint.sh + diff --git a/sdc-os-chef/sdc-kibana/startup.sh b/sdc-os-chef/sdc-kibana/startup.sh index b16aa87a7c..0efa850fba 100644 --- a/sdc-os-chef/sdc-kibana/startup.sh +++ b/sdc-os-chef/sdc-kibana/startup.sh @@ -5,3 +5,4 @@ cd /root/chef-solo chef-solo -c solo.rb -E ${CHEFNAME} /docker-entrypoint.sh kibana + diff --git a/sdc-os-chef/sdc-sanity/startup.sh b/sdc-os-chef/sdc-sanity/startup.sh index c9faae62e5..31a5d49f3a 100644 --- a/sdc-os-chef/sdc-sanity/startup.sh +++ b/sdc-os-chef/sdc-sanity/startup.sh @@ -15,3 +15,4 @@ else fi #/docker-entrypoint.sh + |