commit a317b871e7dd89cf2fce274bbbb3141bd93fac67
author Matteo Scandolo <matteo.scandolo@gmail.com> Tue Jan 10 12:02:41 2017 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> Tue Jan 10 17:18:23 2017 -0800
tree 3093a09252177560c0d009dde2a982c666ef73ee
parent 388f2f1bba27f99b78bae3339c806358ccbe9ae6

Moved xos_ui to port 9000 and xos_bootstrap_ui to port 9001 for all config

Change-Id: I75ab78deb55b344b0b64b183dda2859936045e9c

metronetwork/Makefile

diff --git a/metronetwork/Makefile b/metronetwork/Makefile
index e083347..2f8616f 100644
--- a/metronetwork/Makefile
+++ b/metronetwork/Makefile
@@ -8,15 +8,15 @@
 DOCKER_PROJECT     ?= metronetwork
 BOOTSTRAP_PROJECT  ?= metronetworkbs
 
-XOS_BOOTSTRAP_PORT ?= 9998
-XOS_UI_PORT        ?= 9999
+XOS_BOOTSTRAP_PORT ?= 9001
+XOS_UI_PORT        ?= 9000
 
 BOOTSTRAP_DEVEL_YML        ?= $(CONFIG_DIR)/docker-compose-bootstrap-devel.yml
 
 # Include common functions
 include $(COMMON_DIR)/Makefile
 
-metronetwork: prereqs config_dirs xos_download cord_services cord_libraries bootstrap dashboard onboarding ecord_services
+metronetwork: prereqs config_dirs xos_download cord_services cord_libraries bootstrap dashboard onboarding ecord_services rest-gw ui
 
 # Targets to accomodate users with HTTP proxies
 metronetworkconfig: prereqs config_dirs xos_download cord_services cord_libraries

metronetwork/docker-compose-bootstrap.yml

diff --git a/metronetwork/docker-compose-bootstrap.yml b/metronetwork/docker-compose-bootstrap.yml
index d5307a9..6812288 100644
--- a/metronetwork/docker-compose-bootstrap.yml
+++ b/metronetwork/docker-compose-bootstrap.yml
@@ -18,11 +18,11 @@
     networks:
       - xos
     # command: sleep 86400
-    command: python /opt/xos/manage.py runserver 0.0.0.0:9998 --insecure --makemigrations
+    command: python /opt/xos/manage.py runserver 0.0.0.0:9001 --insecure --makemigrations
     environment:
         - CONFIG_DIR
     ports:
-        - "9998:9998"
+        - "9001:9001"
     links:
         - xos_db
     volumes:

metronetwork/xos-gui.yaml

diff --git a/metronetwork/xos-gui.yaml b/metronetwork/xos-gui.yaml
new file mode 100644
index 0000000..457e946
--- /dev/null
+++ b/metronetwork/xos-gui.yaml
@@ -0,0 +1,29 @@
+tosca_definitions_version: tosca_simple_yaml_1_0
+
+description: Onboard the exampleservice
+
+imports:
+   - custom_types/xos.yaml
+
+topology_template:
+  node_templates:
+
+    # UI Container
+    xos-spa-gui:
+      type: tosca.nodes.Component
+      properties:
+        # command: cd /var/www; BRAND=opencloud npm run build
+        name: xos-spa-gui
+        image: xosproject/xos-gui
+        ports: 4000:4000
+
+    gui-to-gw:
+      type: tosca.nodes.ComponentLink
+      properties:
+          container: xos-rest-gateway
+          alias: xos-rest-gw
+          kind: internal
+      requirements:
+          - xos:
+             node: xos-spa-gui
+             relationship: tosca.relationships.LinkOfComponent
\ No newline at end of file

metronetwork/xos.yaml

diff --git a/metronetwork/xos.yaml b/metronetwork/xos.yaml
index 585458c..e6dd966 100644
--- a/metronetwork/xos.yaml
+++ b/metronetwork/xos.yaml
@@ -10,8 +10,8 @@
     xos:
       type: tosca.nodes.XOS
       properties:
-        ui_port: 9999
-        bootstrap_ui_port: 9998
+        ui_port:  9000
+        bootstrap_ui_port:  9001
         docker_project_name: metronetwork 
         db_container_name: metronetworkbs_xos_db_1