Moved xos_ui to port 9000 and xos_bootstrap_ui to port 9001 for all config
Change-Id: I75ab78deb55b344b0b64b183dda2859936045e9c
diff --git a/frontend/Makefile b/frontend/Makefile
index b533d30..01439c7 100644
--- a/frontend/Makefile
+++ b/frontend/Makefile
@@ -8,13 +8,13 @@
DOCKER_PROJECT ?= frontend
BOOTSTRAP_PROJECT ?= frontendbs
-XOS_BOOTSTRAP_PORT ?= 9998
-XOS_UI_PORT ?= 9999
+XOS_BOOTSTRAP_PORT ?= 9001
+XOS_UI_PORT ?= 9000
# Include common functions
include $(COMMON_DIR)/Makefile
-frontend: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding frontendconfig
+frontend: prereqs config_dirs xos_download cord_services cord_libraries bootstrap onboarding frontendconfig rest-gw ui
onboarding:
@echo "[ONBOARDING]"
@@ -113,11 +113,3 @@
clean-config-folder:
sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 rm -f /opt/xos/xos_configuration/xos_mcord_config
sudo docker exec $(DOCKER_PROJECT)_xos_ui_1 rm -f /opt/xos/xos_configuration/xos_cord_config
-
-experimental-ui: xos_rest_gw_c xos_gui_c
- $(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/disable-onboarding.yaml
- $(RUN_TOSCA_BOOTSTRAP) $(CONFIG_DIR)/ui_containers.yaml
- $(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/enable-onboarding.yaml
- bash $(COMMON_DIR)/wait_for_onboarding_ready.sh $(XOS_BOOTSTRAP_PORT) xos
- bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_UI_PORT)
-
diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index 672033f..26f4b42 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -27,11 +27,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
- xos_redis:redis
diff --git a/frontend/gateway-config.yml b/frontend/gateway-config.yml
deleted file mode 100644
index ae1f0b1..0000000
--- a/frontend/gateway-config.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-default:
- xos:
- host: xos
- port: 9999
- redis:
- host: redis
- port: 6379
- gateway:
- port: 3000
\ No newline at end of file
diff --git a/frontend/ui_containers.yaml b/frontend/ui_containers.yaml
deleted file mode 100644
index 56b64a0..0000000
--- a/frontend/ui_containers.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Onboard the exampleservice
-
-imports:
- - custom_types/xos.yaml
-
-topology_template:
- node_templates:
-
- # API Gateway
- xos-rest-gateway:
- type: tosca.nodes.Component
- properties:
- name: xos-rest-gateway
- image: xosproject/xos-rest-gw
- command: npm start -- --config gateway-config.yml
- ports: 3000:3000
-
- /var/www/src/config/gateway-config.yml:
- type: tosca.nodes.ComponentVolume
- properties:
- host_path: { path_join: [ SELF, CONFIG_DIR, ./gateway-config.yml, ENV_VAR ] }
- read_only: false
- requirements:
- - xos:
- node: xos-rest-gateway
- relationship: tosca.relationships.VolumeOfComponent
-
- gw-to-xos:
- type: tosca.nodes.ComponentLink
- properties:
- container: xos_ui
- alias: xos
- kind: internal
- requirements:
- - xos:
- node: xos-rest-gateway
- relationship: tosca.relationships.LinkOfComponent
-
- gw-to-redis:
- type: tosca.nodes.ComponentLink
- properties:
- container: frontendbs_xos_redis_1
- alias: redis
- kind: external
- requirements:
- - xos:
- node: xos-rest-gateway
- relationship: tosca.relationships.LinkOfComponent
-
- # UI Container
- xos-spa-gui:
- type: tosca.nodes.Component
- properties:
- name: xos-spa-gui
- image: xosproject/xos-gui
- ports: 81:81
-
- 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
diff --git a/frontend/xos-gui.yaml b/frontend/xos-gui.yaml
new file mode 100644
index 0000000..457e946
--- /dev/null
+++ b/frontend/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
diff --git a/frontend/xos.yaml b/frontend/xos.yaml
index 261e6dd..c1f4188 100644
--- a/frontend/xos.yaml
+++ b/frontend/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: frontend
db_container_name: frontendbs_xos_db_1
redis_container_name: frontendbs_xos_redis_1