diff options
| -rw-r--r-- | INFO.yaml | 36 | ||||
| -rwxr-xr-x | ems/microservice-standalone/src/main/assembly/docker/docker-entrypoint.sh | 6 |
2 files changed, 26 insertions, 16 deletions
@@ -22,26 +22,14 @@ realtime_discussion: '' meetings: - type: 'zoom' agenda: 'https://wiki.onap.org/pages/viewpage.action?pageId=6590138' - url: 'https://wiki.onap.org/display/DW/Virtual+Function+Controller+Project' + url: 'https://wiki.onap.org/display/DW/Virtual+Function+Controller+ + Project' server: 'n/a' channel: 'n/a' repeats: 'weekly' time: '09:00 UTC' repositories: - - 'vfc-gvnfm-vnflcm' - - 'vfc-gvnfm-vnfmgr' - - 'vfc-gvnfm-vnfres' - - 'vfc-nfvo-catalog' - - 'vfc-nfvo-db' - - 'vfc-nfvo-driver-ems' - - 'vfc-nfvo-driver-sfc' - - 'vfc-nfvo-driver-vnfm-gvnfm' - - 'vfc-nfvo-driver-vnfm-svnfm' - - 'vfc-nfvo-lcm' - - 'vfc-nfvo-multivimproxy' - - 'vfc-nfvo-resmanagement' - - 'vfc-nfvo-wfengine' - - 'vfc-oom' + - 'vfc/nfvo/driver/ems' committers: - <<: *onap_releng_ptl - name: 'Anatoly Andrianov' @@ -144,11 +132,29 @@ committers: company: 'Intel' id: 'Ruoyu' timezone: 'Asia/ShangHai' + - name: 'Yuanhong Deng' + email: 'dengyuanhong@chinamobile.com' + company: 'China Mobile' + id: 'dengyh' + timezone: 'Asia/ShangHai' + - name: 'Hongyu Zhao' + email: 'zhao.hongyu@zte.com.cn' + company: 'ZTE' + id: 'hongyuzhao' + timezone: 'Asia/ShangHai' tsc: approval: 'https://lists.onap.org/pipermail/onap-tsc' changes: - type: 'Addition' name: 'Denes Nemeth' + link: 'https://lists.onap.org/g/ONAP-TSC/message/3269' + - type: 'Addition' name: 'Haibin Huang' link: 'https://lists.onap.org/g/ONAP-TSC/message/3269' + - type: 'Addition' + name: 'Yuanhong Deng' + link: 'https://lists.onap.org/g/onap-tsc/message/5890' + - type: 'Addition' + name: 'Hongyu Zhao' + link: 'https://lists.onap.org/g/onap-tsc/message/5890' diff --git a/ems/microservice-standalone/src/main/assembly/docker/docker-entrypoint.sh b/ems/microservice-standalone/src/main/assembly/docker/docker-entrypoint.sh index bb11d0e..0455dd6 100755 --- a/ems/microservice-standalone/src/main/assembly/docker/docker-entrypoint.sh +++ b/ems/microservice-standalone/src/main/assembly/docker/docker-entrypoint.sh @@ -15,7 +15,11 @@ echo "MSB_ADDR=$MSB_ADDR" # Wait for MSB initialization echo "Wait for MSB initialization" for i in {1..20}; do - curl -sS -m 1 $MSB_ADDR > /dev/null && break + curl -sS -m 1 $MSB_PROTO:$MSB_ADDR/msb -k > /dev/null + res=$i? + if [ $res -ne 0 ]; then + break + fi sleep $i done |