diff options
| author |   yangyan <yangyanyj@chinamobile.com> | 2020-03-04 21:11:49 +0800 |
|---|---|---|
| committer | Yan Yang <yangyanyj@chinamobile.com> | 2020-03-04 13:12:38 +0000 |
| commit | fff59ec3e331ddf17e5c92223843e13567d33cb4 (patch) | |
| tree | ff859afe449f60f2daadad0f4731e17251e76527 | |
| parent | 64036009d28828c574928bb9cb724552a9696c61 (diff) | |
Fix typo error and timeout error
Change-Id: Idd23ab49ab5046df22d9a40d8f0d56da1903719b
Issue-ID: VFC-1626
Signed-off-by: yangyan <yangyanyj@chinamobile.com>
| -rwxr-xr-x | zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-entrypoint.sh | 2 | ||||
| -rw-r--r-- | zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-env-config.sh | 43 |
2 files changed, 22 insertions, 23 deletions
diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-entrypoint.sh b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-entrypoint.sh index 48f4ad3..f09ae43 100755 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-entrypoint.sh +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-entrypoint.sh @@ -14,7 +14,7 @@ echo "MSB_ADDR=$MSB_ADDR" # Wait for MSB initialization echo "Wait for MSB initialization" -for i in {1..10}; do +for i in {1..5}; do curl -sS -m 1 $MSB_ADDR > /dev/null && break sleep $i done diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-env-config.sh b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-env-config.sh index 2c8dc01..c6e7549 100644 --- a/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-env-config.sh +++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/docker/docker-env-config.sh @@ -1,35 +1,34 @@ #!/bin/bash install_sf(){ - sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf - sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo - yum update -y - yum install -y wget unzip socat java-1.8.0-openjdk-headless - sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security - - # get binary zip from nexus - wget -q -O vfc-sfcdriver-zte.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver- -standalone&a=vfc-nfvo-driver-sfc-zte-sfc-driver&v=LATEST&e=zip' && \ - unzip vfc-sfcdriver-zte.zip && \ - rm -rf vfc-sfcdriver-zte.zip - - chmod +x *.sh - chmod +x docker/*.sh + sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf + sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo + yum update -y + yum install -y wget unzip socat java-1.8.0-openjdk-headless + sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security + + # get binary zip from nexus + wget -q -O vfc-sfcdriver-zte.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.sfc.zte.sfc-driver-standalone&a=vfc-nfvo-driver-sfc-zte-sfc-driver&v=LATEST&e=zip' && \ + unzip vfc-sfcdriver-zte.zip && \ + rm -rf vfc-sfcdriver-zte.zip + + chmod +x *.sh + chmod +x docker/*.sh } add_user(){ - useradd onap - yum -y install sudo - chmod u+x /etc/sudoers - sed -i '/Same thing without a password/a\onap ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers - chmod u-x /etc/sudoers - chown onap:onap -R /service + useradd onap + yum -y install sudo + chmod u+x /etc/sudoers + sed -i '/Same thing without a password/a\onap ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers + chmod u-x /etc/sudoers + chown onap:onap -R /service } clean_sf_cache(){ - - yum clean all + + yum clean all } install_sf |