From: tang peng <tang.peng5@zte.com.cn>
Date: Tue, 24 Jul 2018 15:02:13 +0000 (+0000)
Subject: Merge "Registered the UI to MSB"
X-Git-Tag: 1.2.0~37
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9f7b9daa0ab9851f4427b34d1e5bfa5162587da7;hp=5cda27796aec073b78b2157d4df15a3926c8ba37;p=holmes%2Frule-management.git

Merge "Registered the UI to MSB"
---

diff --git a/rulemgt-frontend/assembly.xml b/rulemgt-frontend/assembly.xml
index ae7f726..bf9a73e 100644
--- a/rulemgt-frontend/assembly.xml
+++ b/rulemgt-frontend/assembly.xml
@@ -9,7 +9,7 @@
   <fileSets>
     <fileSet>
       <directory>dist</directory>
-      <outputDirectory>/holmes</outputDirectory>
+      <outputDirectory>/iui/holmes</outputDirectory>
     </fileSet>
   </fileSets>
 </assembly>
diff --git a/rulemgt-frontend/package.json b/rulemgt-frontend/package.json
index 554620d..d0fae24 100644
--- a/rulemgt-frontend/package.json
+++ b/rulemgt-frontend/package.json
@@ -6,7 +6,7 @@
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build --dev",
-    "prod": "ng build --prod --base-href /holmes/",
+    "prod": "ng build --prod --base-href /iui/holmes/",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
diff --git a/rulemgt-standalone/src/main/assembly/bin/run.sh b/rulemgt-standalone/src/main/assembly/bin/run.sh
index fb7c164..e05c753 100644
--- a/rulemgt-standalone/src/main/assembly/bin/run.sh
+++ b/rulemgt-standalone/src/main/assembly/bin/run.sh
@@ -81,7 +81,9 @@ sed -i "s|keyStorePassword:.*|keyStorePassword: $KEY_PASSWORD|" "$main_path/conf
 ./bin/initDB.sh $JDBC_USERNAME $JDBC_PASSWORD $DB_NAME $DB_PORT "${URL_JDBC%:*}"
 
 
-#Register the frontend to MSB
+#Register the fronten to MSB
+body='{"serviceName": "holmes", "version": "v1", "url": "/iui/holmes","protocol": "UI", "enable_ssl":"true", "visualRange":"0|1", "nodes": [ {"ip": "host_ip","port": "9104"}]}'
+curl -X POST -H "Content-Type: application/json" -d ${body/host_ip/"${HOSTNAME%:*}"} http://${MSB_ADDR}:10081/api/microservices/v1/services
 
 
 nginx -c /usr/local/openresty/nginx/conf/nginx.conf