diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-03-16 18:38:19 +0800 |
|---|---|---|
| committer |   Yingjun Li <yingjun.li@huawei.com> | 2017-03-17 01:32:13 +0000 |
| commit | f141c55066c32d1699debebb56394c04d32e69b2 (patch) | |
| tree | 1c9c6589aabf1602467767d5708a33dee7aa8ebf /juju/juju_connect.sh | |
| parent | 6d809ad2460235ff8bc800a6e630c258df785cae (diff) | |
Add upload packages retry
1. retry 5 times if csar package uploads fail
2. clearwater service name varies over the time
3. use the word vnf instead of app
Change-Id: Id85c7f467cbefbc46fd1f1daf6202d89ef3ac898
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
(cherry picked from commit 8a07bcd6b75f62c7c79504f8a3c020a2d635156e)
Diffstat (limited to 'juju/juju_connect.sh')
| -rwxr-xr-x | juju/juju_connect.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/juju/juju_connect.sh b/juju/juju_connect.sh index 43314b5..e4a94db 100755 --- a/juju/juju_connect.sh +++ b/juju/juju_connect.sh @@ -82,13 +82,20 @@ function start_tomcat() function openo_connect() { - python ${JUJU_DIR}/openo_connect.py --msb_ip $OPENO_IP:$COMMON_SERVICES_MSB_PORT \ + python ${OPERA_DIR}/opera/openo_connect.py --msb_ip $OPENO_IP:$COMMON_SERVICES_MSB_PORT \ --tosca_aria_ip $OPENO_IP \ --tosca_aria_port $COMMON_TOSCA_ARIA_PORT \ --juju_client_ip $juju_client_ip \ --auth_url $OS_AUTH_URL \ - --ns_pkg "${CSAR_DIR}/${APP_NS_PKG}" \ - --vnf_pkg "${CSAR_DIR}/${APP_VNF_PKG}" + --ns_pkg "${CSAR_DIR}/${NS_PKG}" \ + --vnf_pkg "${CSAR_DIR}/${VNF_PKG}" +} + +function deploy_vnf() +{ + python ${OPERA_DIR}/opera/deploy_vnf.py --msb_ip $OPENO_IP:$COMMON_SERVICES_MSB_PORT \ + --vnf $VNF_TYPE \ + --nsdId $NSDID } function fix_openo_containers() |