don't use stdin pipe to run tosca
Change-Id: I34976bb88203ac1b58242cb702a46f78577dce2c
diff --git a/common/Makefile b/common/Makefile
index 4451670..7c8d5ff 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -144,8 +144,8 @@
sudo rm -f $(DOCKER_COMPOSE_YML)
sudo CONFIG_DIR=$(CONFIG_DIR) docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) up -d
bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_BOOTSTRAP_PORT)
- sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none - < $(COMMON_DIR)/tosca/fixtures.yaml
- sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none - < $(CONFIG_DIR)/deployment.yaml
+ sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/bootstrap_tosca/fixtures.yaml
+ sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py none /opt/xos/bootstrap_tosca/deployment.yaml
bash $(COMMON_DIR)/wait_for_xos_port.sh $(XOS_BOOTSTRAP_PORT)
$(RUN_TOSCA_BOOTSTRAP) $(CONFIG_DIR)/xos.yaml
diff --git a/cord-pod/docker-compose-bootstrap.yml b/cord-pod/docker-compose-bootstrap.yml
index 6223fcb..6325c4b 100644
--- a/cord-pod/docker-compose-bootstrap.yml
+++ b/cord-pod/docker-compose-bootstrap.yml
@@ -45,6 +45,8 @@
- ./files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ../../xos_services:/opt/xos_services
- ./admin-openrc.sh:/root/setup/admin-openrc.sh
+ - ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
+ - ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
log_driver: "json-file"
log_opt:
max-size: "1000k"
diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index db50669..e991da4 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -24,6 +24,8 @@
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
+ - ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
- ../../xos/xos/api/utility:/opt/xos/api/utility
- ../../xos/xos/templates:/opt/xos/templates
- ../../xos/xos/core/templatetags:/opt/xos/core/templatetags
diff --git a/mcord/docker-compose-bootstrap.yml b/mcord/docker-compose-bootstrap.yml
index db254f5..bb79486 100644
--- a/mcord/docker-compose-bootstrap.yml
+++ b/mcord/docker-compose-bootstrap.yml
@@ -56,6 +56,8 @@
- ./xos_cord_config:/opt/xos/xos_configuration/xos_cord_config:ro
- ./files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ../../xos_services:/opt/xos_services
+ - ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
+ - ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
log_driver: "json-file"
log_opt:
max-size: "100k"
diff --git a/metronetwork/docker-compose-bootstrap.yml b/metronetwork/docker-compose-bootstrap.yml
index ffbc7e5..dd3fc7e 100644
--- a/metronetwork/docker-compose-bootstrap.yml
+++ b/metronetwork/docker-compose-bootstrap.yml
@@ -16,6 +16,8 @@
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
+ - ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
- ../../xos_services:/opt/xos_services
- ../../xos/xos/api/utility:/opt/xos/api/utility
- ../../xos/xos/core/models:/opt/xos/core/models
diff --git a/test-standalone/docker-compose-bootstrap.yml b/test-standalone/docker-compose-bootstrap.yml
index b86634b..7b8a093 100644
--- a/test-standalone/docker-compose-bootstrap.yml
+++ b/test-standalone/docker-compose-bootstrap.yml
@@ -15,6 +15,8 @@
- ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ../../xos_services:/opt/xos_services
- ../../xos/xos/core/tests:/opt/xos/core/tests
+ - ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
+ - ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
xos_synchronizer_onboarding:
image: xosproject/xos