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/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