clean vsg, vrouter from mcord setup
Change-Id: Ia07d14456aab098e24a18c7d0c878e1f42df3a07
diff --git a/mcord/Makefile b/mcord/Makefile
index c69d038..2ce8584 100644
--- a/mcord/Makefile
+++ b/mcord/Makefile
@@ -53,8 +53,6 @@
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
@@ -62,24 +60,18 @@
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
$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/onos-service/xos/onos-onboard.yaml
#$(RUN_TOSCA_BOOTSTRAP) $(SERVICE_DIR)/fabric/xos/\fabric-onboard.yaml
- #$(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
bash ../common/wait_for_onboarding_ready.sh 81 services/onos
#bash ../common/wait_for_onboarding_ready.sh 81 services/fabric
- #bash ../common/wait_for_onboarding_ready.sh 81 services/vtr
bash ../common/wait_for_onboarding_ready.sh 81 xos
bash ../common/wait_for_xos_port.sh 80
@@ -191,7 +183,7 @@
bash -c "source ./admin-openrc.sh; glance image-show ceilometer-trusty-server-multi-nic || glance image-create --name ceilometer-trusty-server-multi-nic --disk-format qcow2 --file ./images/ceilometer-trusty-server-multi-nic.compressed.qcow2 --container-format bare"
#vsg_custom_images: images/vsg-1.1.img
- bash -c "source ./admin-openrc.sh; glance image-show vsg-1.1 || glance image-create --name vsg-1.1 --disk-format qcow2 --file ./images/vsg-1.1.img --container-format bare"
+# bash -c "source ./admin-openrc.sh; glance image-show vsg-1.1 || glance image-create --name vsg-1.1 --disk-format qcow2 --file ./images/vsg-1.1.img --container-format bare"
images/ceilometer-trusty-server-multi-nic.img: images
bash -c "source ./admin-openrc.sh; glance image-show ceilometer-trusty-server-multi-nic || wget http://www.vicci.org/cord/ceilometer-trusty-server-multi-nic.compressed.qcow2 -P ./images"
diff --git a/mcord/files/vcpe_synchronizer_config b/mcord/files/vcpe_synchronizer_config
deleted file mode 100644
index 9da6ede..0000000
--- a/mcord/files/vcpe_synchronizer_config
+++ /dev/null
@@ -1,47 +0,0 @@
-
-[plc]
-name=plc
-deployment=VICCI
-
-[db]
-name=xos
-user=postgres
-password=password
-host=localhost
-port=5432
-
-[api]
-host=128.112.171.237
-port=8000
-ssl_key=None
-ssl_cert=None
-ca_ssl_cert=None
-ratelimit_enabled=0
-omf_enabled=0
-mail_support_address=support@localhost
-nova_enabled=True
-
-[observer]
-name=vcpe
-dependency_graph=/opt/xos/synchronizers/vsg/model-deps
-steps_dir=/opt/xos/synchronizers/vsg/steps
-sys_dir=/opt/xos/synchronizers/vsg/sys
-deleters_dir=/opt/xos/synchronizers/vsg/deleters
-log_file=console
-#/var/log/hpc.log
-driver=None
-pretend=False
-backoff_disabled=True
-save_ansible_output=True
-# set proxy_ssh to false on cloudlab
-full_setup=True
-proxy_ssh=True
-proxy_ssh_key=/root/setup/node_key
-proxy_ssh_user=root
-
-[networking]
-use_vtn=True
-
-[feefie]
-client_id='vicci_dev_central'
-user_id='pl'
diff --git a/mcord/synchronizers.yaml b/mcord/synchronizers.yaml
index 51bfa34..b75b0e5 100644
--- a/mcord/synchronizers.yaml
+++ b/mcord/synchronizers.yaml
@@ -7,11 +7,6 @@
topology_template:
node_templates:
- servicecontroller#vsg:
- type: tosca.nodes.ServiceController
- properties:
- no-create: true
- synchronizer_config: /root/setup/files/vcpe_synchronizer_config
servicecontroller#openstack:
type: tosca.nodes.ServiceController
properties: