Merge pull request #5 from mrkz/ciao-webui-update

Ciao webui update

ciao-webui/Dockerfile

@@ -1,7 +1,7 @@
 FROM clearlinux
 MAINTAINER marcos.simental.magana@intel.com
 
-ARG WEBUI_VERSION=1.3.11.19
+ARG WEBUI_VERSION=1.3.12.15
 
 ARG swupd_args
 

ciao-webui/README.md

@@ -41,6 +41,8 @@ Environment Variables
   Identity (Keystone) host
 - ``CONTROLLER_HOST``
   Controller (ciao-controller) host
+- ``STORAGE_HOST``
+  Storage (ciao-controller) host
 - ``CERT_PASS``
   Passprhase for the ciao-webui certificate
 - ``MODE``

ciao-webui/bootstrap.sh

@@ -4,6 +4,7 @@ NODE_ENV=$MODE
 CONTROLLER_HOST=$CONTROLLER_HOST
 IDENTITY_HOST=$IDENTITY_HOST
 CERT_PASS=$CERT_PASS
+STORAGE_HOST=$STORAGE_HOST
 
 _usage(){
     >&2 echo "usage:"
@@ -11,6 +12,7 @@ _usage(){
     >&2 echo "                 -v /path/to/ciao-webui-cert.pem:/etc/pki/ciao-webui-cert.pem \\"
     >&2 echo "                 -e CONTROLLER_HOST=controller.example.com \\"
     >&2 echo "                 -e IDENTITY_HOST=keystone.example.com \\"
+    >&2 echo "(optional:       -e STORAGE_HOST=storage.example.com )\\"
     >&2 echo "(optional:       -e CERT_PASS=certificate_passphrase )"
 }
 
@@ -38,6 +40,7 @@ fi
 
 sed -i.bak s/##MODE##/$NODE_ENV/g                   /etc/ciao-webui/ciao_config.json
 sed -i.bak s/##CONTROLLER_HOST##/$CONTROLLER_HOST/g /etc/ciao-webui/ciao_config.json
+sed -i.bak s/##STORAGE_HOST##/$STORAGE_HOST/g       /etc/ciao-webui/ciao_config.json
 sed -i.bak s/##KEYSTONE_HOST##/$IDENTITY_HOST/g     /etc/ciao-webui/ciao_config.json
 sed -i.bak s/##CERT_PASS##/$CERT_PASS/g             /etc/ciao-webui/ciao_config.json
 

ciao-webui/ciao_config.json

@@ -5,6 +5,11 @@
             "port": "8774",
             "protocol": "https"
         },
+        "storage":{
+            "host": "##STORAGE_HOST##",
+            "port": "8776",
+            "protocol": "https"
+        },
         "keystone": {
             "host": "##KEYSTONE_HOST##",
             "port": "35357",