From 8a07bcd6b75f62c7c79504f8a3c020a2d635156e Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Thu, 16 Mar 2017 18:38:19 +0800 Subject: 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 --- conf/application.yml | 12 ------------ conf/open-o.yml | 4 +++- conf/vnf.yml | 13 +++++++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 conf/application.yml create mode 100644 conf/vnf.yml (limited to 'conf') diff --git a/conf/application.yml b/conf/application.yml deleted file mode 100644 index 84f9eef..0000000 --- a/conf/application.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -application: - - name: clearwater - ns_pkg: pop_ns_juju.csar - vnf_pkg: JUJU_clearwater.csar diff --git a/conf/open-o.yml b/conf/open-o.yml index 1281376..fb77eae 100644 --- a/conf/open-o.yml +++ b/conf/open-o.yml @@ -10,4 +10,6 @@ openo_docker_net: nfvo_driver_vnfm_juju_port: 8483 nfvo_driver_vnfm_juju_mysql_port: 3306 -application: +enable_sdno: false + +vnf_type: diff --git a/conf/vnf.yml b/conf/vnf.yml new file mode 100644 index 0000000..68f4492 --- /dev/null +++ b/conf/vnf.yml @@ -0,0 +1,13 @@ +############################################################################## +# Copyright (c) 2016-2017 HUAWEI TECHNOLOGIES CO.,LTD and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +vIMS: + - type: clearwater + ns_pkg: pop_ns_juju.csar + vnf_pkg: JUJU_clearwater.csar + nsdId: ns_cw_2016 -- cgit 1.2.3-korg