Merge pull request #1256 from seokho-son/main

Change message for nginx index

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/<h1>Welcome to nginx!/<h1><br><br>Welcome to Cloud-Barista<br><br><br>My IP is `curl https://api.ipify.org`<br><br>/g" /var/www/html/index.nginx-debian.html
 
 sudo sed -i "s/Commercial support is available at/<h2>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/<a href=\"http:\/\/nginx.com\/\">nginx.com<\/a>.<\/p>/<a href=\"https:\/\/tools.keycdn.com\/geo?host=`curl https://api.ipify.org`\">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/<a href=\"http:\/\/nginx.com\/\">nginx.com<\/a>.<\/p>/<a href=\"https:\/\/www.geolocation.com\/?ip=`curl https://api.ipify.org`#ipresult\">Check the Location of NGINX HOST<\/a>.<\/p>/g" /var/www/html/index.nginx-debian.html
 
 str=$(curl https://api.ipify.org)
 

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 {