remove temporary rm action in makefile
fix references to vtn configuration
make sure test_standalone keys are not created as root
Change-Id: Ie6ebff81c26137b35fe1c73cbadc8dc7a925e28a
diff --git a/common/Makefile.services b/common/Makefile.services
index 3f01df0..6b62a1d 100644
--- a/common/Makefile.services
+++ b/common/Makefile.services
@@ -59,9 +59,6 @@
$(XOS_DIR):
git -C ../.. clone https://gerrit.opencord.org/p/xos.git
- # Make sure the configuratiosn dir doesn't exist
- # TODO: remove this after configurations dir has been removed from xos repo
- rm -rf $(XOS_DIR)/xos/configurations
update_xos:
git -C $(XOS_DIR) pull
diff --git a/frontend/docker-compose-bootstrap.yml b/frontend/docker-compose-bootstrap.yml
index 49a22e8..942c105 100644
--- a/frontend/docker-compose-bootstrap.yml
+++ b/frontend/docker-compose-bootstrap.yml
@@ -14,7 +14,7 @@
- xos_db
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- - ../vtn/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ../../xos_services:/opt/xos_services
xos_synchronizer_onboarding:
diff --git a/test-standalone/Makefile b/test-standalone/Makefile
index 39d9e41..42e21f7 100644
--- a/test-standalone/Makefile
+++ b/test-standalone/Makefile
@@ -58,12 +58,12 @@
onboarding:
echo "[ONBOARDING]"
bash ../common/wait_for_onboarding_ready.sh 9998 xos
- sudo bash -c "echo somekey > key_import/vsg_rsa"
- sudo bash -c "echo somekey > key_import/vsg_rsa.pub"
- sudo bash -c "echo somekey > key_import/volt_rsa"
- sudo bash -c "echo somekey > key_import/volt_rsa.pub"
- sudo bash -c "echo somekey > key_import/onos_rsa"
- sudo bash -c "echo somekey > key_import/onos_rsa.pub"
+ bash -c "echo somekey > key_import/vsg_rsa"
+ bash -c "echo somekey > key_import/vsg_rsa.pub"
+ bash -c "echo somekey > key_import/volt_rsa"
+ bash -c "echo somekey > key_import/volt_rsa.pub"
+ bash -c "echo somekey > key_import/onos_rsa"
+ bash -c "echo somekey > key_import/onos_rsa.pub"
sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None - < ../common/disable-onboarding.yaml
sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None - < $(SERVICE_DIR)/vrouter/xos/vrouter-onboard.yaml
sudo docker-compose -p $(BOOTSTRAP_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None - < $(SERVICE_DIR)/olt/xos/volt-onboard.yaml
diff --git a/test-standalone/docker-compose-bootstrap.yml b/test-standalone/docker-compose-bootstrap.yml
index 857db96..5e51f60 100644
--- a/test-standalone/docker-compose-bootstrap.yml
+++ b/test-standalone/docker-compose-bootstrap.yml
@@ -12,7 +12,7 @@
- xos_db
volumes:
- ../common/xos_common_config:/opt/xos/xos_configuration/xos_common_config
- - ../vtn/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
+ - ../cord-pod/files/xos_vtn_config:/opt/xos/xos_configuration/xos_vtn_config:ro
- ../../xos_services:/opt/xos_services
xos_synchronizer_onboarding: