bugfix - Failed to create new rules via Holmes GUI

Change-Id: Ied630613f2504b36fe313ff727a636a00546a9f6
Issue-ID: HOLMES-440
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index 3f32d4e..89aadb1 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -108,7 +108,7 @@ fi
 ${RUNHOME}/initDB.sh $JDBC_USERNAME $JDBC_PASSWORD $DB_NAME $DB_PORT "${URL_JDBC%:*}"
 
 
-#Register the fronten to MSB
+#Register the frontend to MSB
 #body='{"serviceName":"holmes","version":"v1","url":"/iui/holmes","nodes":[{"ip":"host_ip","port":"9104","lb_server_params":"","checkType":"","checkUrl":"","checkInterval":"","checkTimeOut":"","ttl":"","ha_role":""}],"protocol":"UI","visualRange":"0|1","lb_policy":"","publish_port":"","namespace":"","network_plane_type":"","host":"","path":"","labels":[],"metadata":[]}'
 #msg_body=${body/host_ip/"${HOSTNAME%:*}"}
 #curl -X POST -H "Content-Type: application/json" -d ${msg_body} http://${MSB_ADDR}/api/msdiscover/v1/services?is_manual=true
@@ -119,6 +119,9 @@ if [ -f "/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.crt" ]; then
     sed -i "s|/etc/ssl/private/holmes-frontend.key|/opt/app/osaaf/local/org.onap.holmes-rule-mgmt.key|" "/etc/nginx/conf.d/nginx-https.conf"
 fi
 
+
+sed -i "s|msb-iag.onap|$MSB_ADDR|g" /etc/nginx/conf.d/nginx-http*.conf
+
 if [ ${ENABLE_ENCRYPT} = true ]; then
     nginx -c /etc/nginx/conf.d/nginx-https.conf
 else

diff --git a/rulemgt-standalone/src/main/assembly/nginx-http.conf b/rulemgt-standalone/src/main/assembly/nginx-http.conf
index 856ad0d..e0c4ff3 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/nginx-http.conf
+++ b/rulemgt-standalone/src/main/assembly/nginx-http.conf
@@ -39,12 +39,12 @@ http {
             proxy_redirect off;
 
             if ($uri ~ "/api/holmes-rule-mgmt/(.*)") {
-                proxy_pass http://$host:9101$request_uri;
+                proxy_pass http://msb-iag.onap$request_uri;
                 break;
             }
 
             if ($uri ~ "/api/holmes-engine-mgmt/(.*)") {
-                proxy_pass http://$host:9102$request_uri;
+                proxy_pass http://msb-iag.onap$request_uri;
                 break;
             }
         }

diff --git a/rulemgt-standalone/src/main/assembly/nginx-https.conf b/rulemgt-standalone/src/main/assembly/nginx-https.conf
index 02384bb..c89c0bd 100644 (file)
--- a/rulemgt-standalone/src/main/assembly/nginx-https.conf
+++ b/rulemgt-standalone/src/main/assembly/nginx-https.conf
@@ -42,12 +42,12 @@ http {
             proxy_redirect off;
 
             if ($uri ~ "/api/holmes-rule-mgmt/(.*)") {
-                proxy_pass https://$host:9101$request_uri;
+                proxy_pass https://msb-iag.onap$request_uri;
                 break;
             }
 
             if ($uri ~ "/api/holmes-engine-mgmt/(.*)") {
-                proxy_pass https://$host:9102$request_uri;
+                proxy_pass https://msb-iag.onap$request_uri;
                 break;
             }
         }