From ed1767869c1e51200b91f5e7608a648d9cd2eadf Mon Sep 17 00:00:00 2001 From: Harry Huang Date: Tue, 21 Mar 2017 11:31:56 +0800 Subject: 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) --- deploy/launch.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'deploy/launch.sh') diff --git a/deploy/launch.sh b/deploy/launch.sh index aa476784..5f1ee1cb 100755 --- a/deploy/launch.sh +++ b/deploy/launch.sh @@ -142,5 +142,8 @@ echo "NOTE: openrc file is in the controller nodes" echo "" if [[ ${DHA##*/} =~ "openo" ]]; then - python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK + sudo python ${COMPASS_DIR}/deploy/opera_adapter.py $DHA $NETWORK + if [[ $? -ne 0 ]]; then + exit 1 + fi fi -- cgit 1.2.3-korg