From: Harry Huang Date: Sat, 25 Mar 2017 00:47:03 +0000 (+0800) Subject: Update git submodules X-Git-Tag: danube.1.RC1~188 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8e0e74ed0ee8c1ef8a9eb2dd2650f867585ed2a1;p=opnfvdocs.git Update git submodules * Update docs/submodules/opera from branch 'stable/danube' - Updated Ellis configuration 1. Fix the Ellis port inaccessible issue 2. Force to pull the latest juju server code Change-Id: I8b36271e37e19d3ebab03a9808f11d210f975d59 Signed-off-by: Harry Huang (cherry picked from commit 654e20848b723541c17d56cf16518db87e14f7ae) - fix pyyaml bug package_prepare should run before generate_conf to ensure pyyaml is installed. otherwise generate_conf will fail when pyyaml is not installed before. Change-Id: I181225637969f3602ce34984e4710a2610e8cd18 Signed-off-by: Harry Huang (cherry picked from commit a6346420a0e0d2f4564d8ecc030146cae098a7f4) - Merge "Add delay when upload csar package fail" into stable/danube - Opera Docs version: firt draft Change-Id: Id0ba01cd205229f0a11ce0d9a921f5fce84dd221 Signed-off-by: Harry Huang (cherry picked from commit f8eb16e4a3c38d4899234c95356c88f9c80789da) - Add delay when upload csar package fail There is occasional failure when upload csar package. Add 10 second 10 retries to workaroud this problem. Change-Id: I0d081699d744bc2a3f93d23fa5afea48f426beff Signed-off-by: Harry Huang (cherry picked from commit f809fd6d07d3447af62297377f963e1c6e4556e3) - add get_vnfm_ip add function get_vnfm_ip to get juju client vm ip Change-Id: Ib78d81ab2bb54ecc197581913c5127235bc563da Signed-off-by: Harry Huang (cherry picked from commit 4867ce93ff214e5bcb1b3b178173080a17bfc5dd) - fix csar bug csar vars not generate when vnf_type is None. modify process_conf to fix this bug Change-Id: I9967acc9d7c1cea9012f8feb5b8f0141f1c6d3b8 Signed-off-by: Harry Huang (cherry picked from commit f1ef7f43d12751b10314a7e07c3e3ae815057a39) - 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 (cherry picked from commit 8a07bcd6b75f62c7c79504f8a3c020a2d635156e) - independent network for opera 1. launch open-o dockers directly on jump host instead of a vm 2. launch only one juju vm has both client and metadata function 3. add clearwater csar packages into opera repo 4. automatically deploy clearwater when key application in conf/application.yml has value clearwater 5. support keystone v3 Change-Id: Ic59f66d2cededf661aa7f6de2a40836ea40d8887 Signed-off-by: Harry Huang (cherry picked from commit cd0feb45a414980fdd7249c9cc4fc28a1213c769) --- diff --git a/docs/submodules/opera b/docs/submodules/opera index 4867ce93f..a10160eb8 160000 --- a/docs/submodules/opera +++ b/docs/submodules/opera @@ -1 +1 @@ -Subproject commit 4867ce93ff214e5bcb1b3b178173080a17bfc5dd +Subproject commit a10160eb86f804a9daafdf156812c6b90f1b01a3