From f9a0ac7e59d3d05d3f3826e86f70511ebacb81aa Mon Sep 17 00:00:00 2001 From: Seokho Son Date: Sun, 6 Nov 2022 18:39:25 +0900 Subject: [PATCH 1/2] Change message for nginx index --- scripts/setweb.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/setweb.sh b/scripts/setweb.sh index 56c6974b6..088e56d61 100755 --- a/scripts/setweb.sh +++ b/scripts/setweb.sh @@ -6,15 +6,13 @@ nginx -v sudo service nginx start -sudo sed -i "s/Welcome to nginx/Welcome, my IP is `curl https://api.ipify.org`/g" /var/www/html/index.nginx-debian.html +sudo sed -i "s/

Welcome to nginx!/



Welcome to Cloud-Barista


My IP is `curl https://api.ipify.org`

/g" /var/www/html/index.nginx-debian.html sudo sed -i "s/Commercial support is available at/

Check CB-Tumblebug MCIS VM Location<\/h2>/g" /var/www/html/index.nginx-debian.html sudo sed -i "s/Thank you for using nginx/Thank you for using Cloud-Barista and CB-Tumblebug/g" /var/www/html/index.nginx-debian.html -sudo sed -i "s/nginx.com<\/a>.<\/p>/Check the Location of NGINX HOST<\/a>.<\/p>/g" /var/www/html/index.nginx-debian.html - -sudo sed -i "s/:\/\/nginx.org\/\">nginx.org/:\/\/`curl https://api.ipify.org`:8888\/\">. Call to generate CPU load/g" /var/www/html/index.nginx-debian.html +sudo sed -i "s/nginx.com<\/a>.<\/p>/Check the Location of NGINX HOST<\/a>.<\/p>/g" /var/www/html/index.nginx-debian.html str=$(curl https://api.ipify.org) From ac48dabb8712b9e15bedadf6d843fa738497896d Mon Sep 17 00:00:00 2001 From: Seokho Son Date: Sun, 6 Nov 2022 19:07:44 +0900 Subject: [PATCH 2/2] Delete associated mc-nlb mcis --- src/core/mcis/manageInfo.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/core/mcis/manageInfo.go b/src/core/mcis/manageInfo.go index 7237578c4..d621136ef 100644 --- a/src/core/mcis/manageInfo.go +++ b/src/core/mcis/manageInfo.go @@ -1931,6 +1931,18 @@ func DelMcis(nsId string, mcisId string, option string) (common.IdList, error) { } deletedResources.IdList = append(deletedResources.IdList, output.IdList...) + // delete associated MCIS NLBs + mcisNlbId := mcisId + "-nlb" + check, _ = CheckMcis(nsId, mcisNlbId) + if check { + mcisNlbDeleteResult, err := DelMcis(nsId, mcisNlbId, option) + if err != nil { + common.CBLog.Error(err) + return deletedResources, err + } + deletedResources.IdList = append(deletedResources.IdList, mcisNlbDeleteResult.IdList...) + } + // delete mcis info err = common.CBStore.Delete(key) if err != nil {