From 8385ea7e25b91435ba5182f6402dcf974fdff075 Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Thu, 23 Mar 2017 15:52:09 +0800 Subject: Update git submodules * Update docs/submodules/compass4nfv from branch 'stable/danube' - opera adapter fix2 * opera_adapter need sshpass which may cause deploy fail * compass log redirection is the last command which always return 0 and thus cover deploy error 1. add installation of sshpass in prepare.sh 2. echo a string at the end of deploy/launch.sh into log file to judge if deployment is complete 3. fix typing error in util/check_valid.py Change-Id: Ic4bca50b2c316bf46cace45b9b3317ef9452a0ba Signed-off-by: Harry Huang - Opera adapter fix * CI return 0 when opera_adapter fails which cover the error. * opera_adapter runs with no sudo will fail when generate ssh key. * opera_adapter.py use simple ip replacement for openrc file will lead to error when openrc file changed in compass. 1. add judgement to tell if opera_adapter fails 2. add sudo when run opera_adapter 3. pass data in openrc files to opera openrc instead of ip rewriting Change-Id: I681717947746b768791529975a5b0d2a23c6069a Signed-off-by: Harry Huang (cherry picked from commit b21d57081d4b705689cb6d7372e254818b84a760) - update opera fix opera codes has been updated and network_openo.yml is modified according to new opera net config. open-o related keys in deploy/compass_conf/package_metadata/openstack.conf should be modified as well Change-Id: I55f8ed3dedcbfd30a3f01b70c958258199f600e6 Signed-off-by: Harry Huang (cherry picked from commit b7fb5c062e0e806e34ebc53fe670f00f8417cd4a) - update opera related files 1. update opera_adapter.py to sync new opera config 2. modify all os-nosdn-openo-ha.yml, add open-o version and vnf type 3. modify all network_openo.yml, using only one external ip and assign open-o docker ips Change-Id: Iadcba8cc2fc17ddf32dfea9fe52c471a6bfadde8 Signed-off-by: Harry Huang (cherry picked from commit 524fea7f6eacfa6a102614b7fb4c66e1be1b8287) - Merge "Add ONOS scenario to daily master" into stable/danube - Merge "onos 1.8 upgradation for danube" into stable/danube - Add ONOS scenario to daily master Currently ONOS scenario only runs when OpenStack version is set to Mitaka. This patch is going to change daily ONOS scenario to run with OpenStack Newton. Change-Id: I6595d23778bb50772531e1419d2c7b7b72988967 Signed-off-by: Yifei Xue (cherry picked from commit 8c13e15ef13be59dfbb80e3bc115ed8d486d365b) - onos 1.8 upgradation for danube Change-Id: I6242b9fc09749ca83f446ef5456eaad72f248012 Signed-off-by: rssaravana (cherry picked from commit 8da5888adfc919b20807f0783e1ae841fac4244e) - Add network_openo.yml in all virtual pods add network_openo.yml to adapt with open-o scenario in: 1. huawei-virtual1 2. huawei-virtual2 3. huawei-virtual3 4. huawei-virtual4 5. huawei-virtual7 Change-Id: I96046470ddb05f8f613489db35f4a6b623a5cf4c Signed-off-by: Harry Huang (cherry picked from commit 36de0a04135b0932eab1e3a30d703a98aabc031d) - Merge "Adding Labels" into stable/danube - Adding Labels Labels serve as anchors/ refs when referenced from other documents This patch adds labels to docs/*/*/index.rst Change-Id: I66414622edcb73d22142d03d55c2040c3ff70d68 Signed-off-by: ShubhamRathi (cherry picked from commit f6971e40269878da23f853a517e1416d8b1a770a) - Add deploy log to file JIRA: - The default log file path is: work/deploy/log/compass-deploy.log Change-Id: I6f8ebb028d169a0da88f2a588e4563db4f2f1f76 Signed-off-by: QiLiang (cherry picked from commit 185218b1731357f1ef4ee4f2898519ede9a34912) --- docs/submodules/compass4nfv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs') diff --git a/docs/submodules/compass4nfv b/docs/submodules/compass4nfv index e1bcc8478..fb5c383c7 160000 --- a/docs/submodules/compass4nfv +++ b/docs/submodules/compass4nfv @@ -1 +1 @@ -Subproject commit e1bcc84781b51e8078387d071c24eeead2700cb9 +Subproject commit fb5c383c7d88f27c5dcea3b4b1920ffd612cae2e -- cgit 1.2.3-korg