Moved xos-rest-gw config in configuration folders
Change-Id: I9d521d89284f550ac2b95a75a375fab0e2f2463f
diff --git a/common/Makefile b/common/Makefile
index ce0b916..e85d92e 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -235,7 +235,7 @@
rest-gw: xos_rest_gw_c
$(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/tosca/disable-onboarding.yaml
- $(RUN_TOSCA_BOOTSTRAP) $(COMMON_DIR)/xos-rest-gw.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(CONFIG_DIR)/xos-rest-gw.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/common/xos-rest-gw.yaml b/common/xos-rest-gw.yaml
deleted file mode 100644
index a4b1062..0000000
--- a/common/xos-rest-gw.yaml
+++ /dev/null
@@ -1,51 +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
-
- # API Gateway config file
- /var/www/src/config/gateway-config.yml:
- type: tosca.nodes.ComponentVolume
- properties:
- host_path: { path_join: [ SELF, CONFIG_DIR, ./../common/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
\ No newline at end of file