Merge branch 'master' of https://github.com/open-cloud/xos
diff --git a/xos/configurations/common/wait_for_onboarding_ready.sh b/xos/configurations/common/wait_for_onboarding_ready.sh
index 9606dbb..dbfdde8 100755
--- a/xos/configurations/common/wait_for_onboarding_ready.sh
+++ b/xos/configurations/common/wait_for_onboarding_ready.sh
@@ -17,6 +17,7 @@
echo "$2 is onboarded"
exit 0
fi
+ echo -ne "."
sleep 1
# RUNNING_CONTAINER=`sudo docker ps|grep "xos"|awk '{print $$NF}'`
# if [[ $RUNNING_CONTAINER == "" ]]; then
diff --git a/xos/configurations/frontend/Makefile b/xos/configurations/frontend/Makefile
index 8845196..b322ffe 100644
--- a/xos/configurations/frontend/Makefile
+++ b/xos/configurations/frontend/Makefile
@@ -41,7 +41,7 @@
sudo docker-compose -f $(BOOTSTRAP_YML) stop
showlogs:
- sudo docker-compose logs
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) logs
rm: stop
test ! -s $(DOCKER_COMPOSE_YML) || sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) rm
diff --git a/xos/configurations/test-standalone/Makefile b/xos/configurations/test-standalone/Makefile
index 9807e5d..3566d80 100644
--- a/xos/configurations/test-standalone/Makefile
+++ b/xos/configurations/test-standalone/Makefile
@@ -44,16 +44,20 @@
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"
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/common/disable-onboarding.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vrouter/vrouter-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/volt/volt-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vsg/vsg-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vtr/vtr-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/onos/onos-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/common/enable-onboarding.yaml
bash ../common/wait_for_onboarding_ready.sh 9998 services/vrouter
bash ../common/wait_for_onboarding_ready.sh 9998 services/volt
bash ../common/wait_for_onboarding_ready.sh 9998 services/vsg
bash ../common/wait_for_onboarding_ready.sh 9998 services/vtr
+ bash ../common/wait_for_onboarding_ready.sh 9998 services/onos
bash ../common/wait_for_onboarding_ready.sh 9998 xos
bash ../common/wait_for_xos_port.sh 9999
@@ -97,8 +101,8 @@
sudo docker-compose logs
rm: stop
- test ! -s $(DOCKER_COMPOSE_YML) || sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) rm
- sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) rm
+ test ! -s $(DOCKER_COMPOSE_YML) || sudo docker-compose -p $(DOCKER_PROJECT) -f $(DOCKER_COMPOSE_YML) rm -f
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) rm -f
docker-clean:
sudo docker rm -f $(shell sudo docker ps -aq)
diff --git a/xos/onboard/onos/onos-onboard.yaml b/xos/onboard/onos/onos-onboard.yaml
index 1338bb6..3d4ac3b 100644
--- a/xos/onboard/onos/onos-onboard.yaml
+++ b/xos/onboard/onos/onos-onboard.yaml
@@ -20,7 +20,7 @@
synchronizer_run: onos-synchronizer.py
#tosca_custom_types: exampleservice.yaml
tosca_resource: tosca/resources/onosservice.py, tosca/resources/onosapp.py
- rest_service: subdirectory:vsg api/service/onos.py
+ rest_service: api/service/onos.py
rest_tenant: subdirectory:onos api/tenant/onos/app.py
private_key: file:///opt/xos/key_import/onos_rsa
public_key: file:///opt/xos/key_import/onos_rsa.pub