Moved XOS to port 9000 for all configurations
Change-Id: I602b5d78bd559f73a51eb2419245680f02f03e54
diff --git a/roles/head-prologue/files/cord-http.conf b/roles/head-prologue/files/cord-http.conf
index fe8daf4..0fca272 100644
--- a/roles/head-prologue/files/cord-http.conf
+++ b/roles/head-prologue/files/cord-http.conf
@@ -27,16 +27,28 @@
ProxyPass "ws://onos-cord:8182/onos/ui/websock/" disablereuse=on
</Location>
+ # Cord SPA and rest-gw
+ ProxyPass /spa http://xos-spa-gui:4000
+ ProxyPass /spa/api http://xos-rest-gw:3000/api
+ ProxyPass /spa/socket.io http://xos-rest-gw:3000/socket.io
+ ProxyPass /socket.io http://xos-rest-gw:3000/socket.io
+ <Location /socket.io>
+ RewriteEngine on
+ RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC]
+ RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
+ RewriteRule .* ws://xos-rest-gw:3000%{REQUEST_URI} [P]
+ </Location>
+
# Map the various XOS roots to the XOS instance
- ProxyPass /xos http://xos:8888
- ProxyPass /xos/ http://xos:8888/
- ProxyPassMatch /(api)$ http://xos:8888/$1/
- ProxyPass /api/ http://xos:8888/api/
- ProxyPass /login http://xos:8888/login
- ProxyPass /admin/ http://xos:8888/admin/
- ProxyPass /static/ http://xos:8888/static/
- ProxyPass /loggedin/ http://xos:8888/loggedin/
- ProxyPass /serviceGrid/ http://xos:8888/serviceGrid/
+ ProxyPass /xos http://xos:9000
+ ProxyPass /xos/ http://xos:9000/
+ ProxyPassMatch /(api)$ http://xos:9000/$1/
+ ProxyPass /api/ http://xos:9000/api/
+ ProxyPass /login http://xos:9000/login
+ ProxyPass /admin/ http://xos:9000/admin/
+ ProxyPass /static/ http://xos:9000/static/
+ ProxyPass /loggedin/ http://xos:9000/loggedin/
+ ProxyPass /serviceGrid/ http://xos:9000/serviceGrid/
</IfModule>
<IfModule rewrite_module>