Add vsg,vrouter relative code for short term
(1) once onos synchronizer does not depend on vsg and vrouter,
we should remove vsg and vrouter from M-CORD
(2) changed the compute node name
(3) comment the CORDSubscriber and CORDUser relative code inside setup.yaml for now,
because currently, this two objects are inside olt service.
Change-Id: Ice69e4aa22276da3e94373c0b777303d87c9a703
diff --git a/mcord/Makefile b/mcord/Makefile
index 3edb916..c69d038 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -52,6 +52,9 @@
# on-board any services here
bash ../common/wait_for_onboarding_ready.sh 81 xos
$(RUN_TOSCA_BOOTSTRAP) ../common/disable-onboarding.yaml
+
+ sudo cp id_rsa key_import/vsg_rsa
+ sudo cp id_rsa.pub key_import/vsg_rsa.pub
sudo cp id_rsa key_import/vBBU_rsa
sudo cp id_rsa.pub key_import/vBBU_rsa.pub
sudo cp id_rsa key_import/vPGW_rsa
@@ -59,6 +62,8 @@
sudo cp id_rsa key_import/onos_rsa
sudo cp id_rsa key_import/onos_rsa.pub
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/openstack/xos/openstack-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vrouter/xos/vrouter-onboard.yaml
+ $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vsg/xos/vsg-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vBBU/xos/vBBU-onboard.yaml
# $(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vPGWC/xos/vPGWC-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtn/xos/vtn-onboard.yaml
@@ -67,6 +72,8 @@
#$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/vtr/xos/vtr-onboard.yaml
$(RUN_TOSCA_BOOTSTRAP) synchronizers.yaml
$(RUN_TOSCA_BOOTSTRAP) ../common/enable-onboarding.yaml
+ bash ../common/wait_for_onboarding_ready.sh 81 services/vrouter
+ bash ../common/wait_for_onboarding_ready.sh 81 services/vsg
bash ../common/wait_for_onboarding_ready.sh 81 services/vbbu
#bash ../common/wait_for_onboarding_ready.sh 81 services/vPGWC
bash ../common/wait_for_onboarding_ready.sh 81 services/vtn