diff --git a/instantiate-monitoringservice-playbook.yml b/instantiate-monitoringservice-playbook.yml
deleted file mode 100644
index 66c122f..0000000
--- a/instantiate-monitoringservice-playbook.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# instantiate-monitoringservice.yml
-# Adds the monitoringservice to the currently running pod
-# TODO: Due to some timing issues, the monitroing service synchronizer is not completely getting
-# onboarded with in the retries of onboard-monitoringservice.yml, so the ansible script would
-# eventually fail. Until it is fixed, once monitoring service synchronizer is ready, run this
-# ansible playbook which has only tasks for instantiating the monitoring service models.
-
-- name: Create monitoringservice config
-  hosts: head
-  roles:
-    - monitoringservice-config
-
-- include: add-onboard-containers-playbook.yml
-
-- name: Check to see if XOS UI is ready
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - xos-ready
-
-- name: Instantiate monitoringservice and channel
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - monitoringservice-instantiate
-
diff --git a/monitoringagent-infra-install-config.yml b/monitoringagent-infra-install-config.yml
deleted file mode 100644
index a8494b0..0000000
--- a/monitoringagent-infra-install-config.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringagent-infra-install-config.yml
-# Generates the inventory file to be used to run the monitoringagent-infra-install.yml playbook
-# should be run with /etc/maas/ansible/pod-inventory as inventory file
-# ansible-playbook -i /etc/maas/ansible/pod-inventory --extra-vars=@/opt/cord/build/genconfig/config.yml monitoringagent-infra-install-config.yml
-
-- name: Create monitoringagent config
-  hosts: head
-  roles:
-    - monitoringagent-infra-install-config
diff --git a/monitoringagent-infra-install.yml b/monitoringagent-infra-install.yml
deleted file mode 100644
index 8af4104..0000000
--- a/monitoringagent-infra-install.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringagent-infra-install.yml
-# Install the monitoringagents on head node ceilometer-1 and all compute nodes
-# should be run with config generated inventory file /opt/cord_profile/monitoringagent_install.hosts
-# ansible-playbook -i /opt/cord_profile/monitoringagent_install.hosts monitoringagent-infra-install.yml
-
-- include: "/opt/cord/orchestration/xos_services/monitoring/xos/synchronizer/ceilometer/monitoring_agent/ceilometer_config.yaml"
-  vars:
-     instance_name: head
-
-- include: "/opt/cord/orchestration/xos_services/monitoring/xos/synchronizer/ceilometer/monitoring_agent/ceilometer_config.yaml"
-  vars:
-     instance_name: compute
diff --git a/monitoringservice-enable-exampleservicemonitoring.yml b/monitoringservice-enable-exampleservicemonitoring.yml
deleted file mode 100644
index b4634bb..0000000
--- a/monitoringservice-enable-exampleservicemonitoring.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-exampleservicemonitoring.yml
-# Enables monitoring for exampleservice
-# ansible-playbook -i inventory/rcord --extra-vars @../genconfig/config.yml monitoringservice-enable-exampleservicemonitoring.yml
-
-- name: Create config files for enabling exampleservice monitoring
-  hosts: head
-  roles:
-    - monitoringservice-enable-exampleservicemonitoring-config
-
-- include: add-onboard-containers-playbook.yml
-
-- name: Run role to execute TOSCA file
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - monitoringservice-enable-exampleservicemonitoring
-
diff --git a/monitoringservice-enable-inframonitoring-config.yml b/monitoringservice-enable-inframonitoring-config.yml
deleted file mode 100644
index 514dfe2..0000000
--- a/monitoringservice-enable-inframonitoring-config.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-inframonitoring-config.yml
-# Generates the TOSCA files to be used to run the monitoringservice-enable-inframonitoring.yml playbook
-# should be run with /etc/maas/ansible/pod-inventory as inventory file
-# ansible-playbook -i /etc/maas/ansible/pod-inventory --extra-vars=@/opt/cord/build/genconfig/config.yml monitoringservice-enable-inframonitoring-config.yml
-
-- name: Create config files for enabling infrastructure monitoring
-  hosts: head
-  roles:
-    - monitoringservice-enable-inframonitoring-config
diff --git a/monitoringservice-enable-inframonitoring.yml b/monitoringservice-enable-inframonitoring.yml
deleted file mode 100644
index 98303ba..0000000
--- a/monitoringservice-enable-inframonitoring.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-inframonitoring.yml
-# Enables monitoring for infrastructure services (OpenStack and ONOS)
-# ansible-playbook -i inventory/rcord --extra-vars @../genconfig/config.yml monitoringservice-enable-inframonitoring.yml
-
-- include: add-onboard-containers-playbook.yml
-
-- name: Run role to execute TOSCA file
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - monitoringservice-enable-inframonitoring
-
diff --git a/monitoringservice-enable-vsgmonitoring.yml b/monitoringservice-enable-vsgmonitoring.yml
deleted file mode 100644
index f97abe8..0000000
--- a/monitoringservice-enable-vsgmonitoring.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-vsgmonitoring.yml
-# Enables monitoring for vSG service
-# ansible-playbook -i inventory/rcord --extra-vars @../genconfig/config.yml monitoringservice-enable-vsgmonitoring.yml
-
-- name: Create config files for enabling vSG monitoring
-  hosts: head
-  roles:
-    - monitoringservice-enable-vsgmonitoring-config
-
-- include: add-onboard-containers-playbook.yml
-
-- name: Run role to execute TOSCA file
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - monitoringservice-enable-vsgmonitoring
-
diff --git a/monitoringservice-test-exampleservicemetrics.yaml b/monitoringservice-test-exampleservicemetrics.yaml
deleted file mode 100644
index e0be295..0000000
--- a/monitoringservice-test-exampleservicemetrics.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice_test_exampleservicemetrics.yml
-# Tests the monitoringservice after enabling monitoring for exampleservice
-
-- name: Invoke common+test-exampleservicemonitoring roles
-  hosts: head
-  roles:
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/common", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/test-exampleservicemonitoring", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
diff --git a/monitoringservice-test-inframetrics.yaml b/monitoringservice-test-inframetrics.yaml
deleted file mode 100644
index 13f20d0..0000000
--- a/monitoringservice-test-inframetrics.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice_test_inframetrics.yml
-# Tests the monitoringservice after infrastructure monitoring is enabled
-
-- name: Invoke common+test-inframonitoring roles
-  hosts: head
-  roles:
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/common", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/test-inframonitoring", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
diff --git a/monitoringservice-test-initial.yaml b/monitoringservice-test-initial.yaml
deleted file mode 100644
index cc0221e..0000000
--- a/monitoringservice-test-initial.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice_test_initial.yml
-# Tests the monitoringservice after it is onboarded
-
-- name: Invoke common+test-initial roles
-  hosts: head
-  roles:
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/common", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/test-initial", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
diff --git a/monitoringservice-test-vsgmetrics.yaml b/monitoringservice-test-vsgmetrics.yaml
deleted file mode 100644
index 590108b..0000000
--- a/monitoringservice-test-vsgmetrics.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice_test_vsgmetrics.yml
-# Tests the monitoringservice after enabling monitoring for vSG service
-
-- name: Invoke common+test-vsgmonitoring roles
-  hosts: head
-  roles:
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/common", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
-    - {role: "/opt/cord/orchestration/xos_services/monitoring/xos/test/roles/test-vsgmonitoring", auth: {user: "{{ xos_admin_user }}", pass: "{{ xos_admin_pass }}"} }
diff --git a/onboard-monitoringservice-playbook.yml b/onboard-monitoringservice-playbook.yml
deleted file mode 100644
index 3edb7b9..0000000
--- a/onboard-monitoringservice-playbook.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# onboard-monitoringservice.yml
-# Adds the monitoringservice to the currently running pod
-
-- name: Create monitoringservice config
-  hosts: head
-  roles:
-    - monitoringservice-config
-
-- include: add-bootstrap-containers-playbook.yml
-
-- name: Onboard monitoringservice
-  hosts: xos_bootstrap_ui
-  connection: docker
-  roles:
-    - monitoringservice-onboard
-
-- include: add-onboard-containers-playbook.yml
-
-- name: Check to see if XOS UI is ready
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - xos-ready
-
-- name: Instantiate monitoringservice and channel
-  hosts: xos_ui
-  connection: docker
-  roles:
-    - monitoringservice-instantiate
-
diff --git a/roles/monitoringagent-infra-install-config/tasks/main.yml b/roles/monitoringagent-infra-install-config/tasks/main.yml
deleted file mode 100644
index 4b22fa7..0000000
--- a/roles/monitoringagent-infra-install-config/tasks/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringagent-config/tasks/main.yml
-
-- name: Variable file holding all target nodes where infra monitoring agent to be installed
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ cord_profile_dir }}/{{ item }}"
-  with_items:
-    - "monitoringagent_install.hosts"
-
diff --git a/roles/monitoringagent-infra-install-config/templates/monitoringagent_install.hosts.j2 b/roles/monitoringagent-infra-install-config/templates/monitoringagent_install.hosts.j2
deleted file mode 100644
index 1c8e7ab..0000000
--- a/roles/monitoringagent-infra-install-config/templates/monitoringagent_install.hosts.j2
+++ /dev/null
@@ -1,25 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-[head]
-ceilometer-1.cord.lab
-
-[compute]
-{% for node in groups["compute"] %}
-{{ node }}
-{% endfor %}
diff --git a/roles/monitoringservice-config/defaults/main.yml b/roles/monitoringservice-config/defaults/main.yml
deleted file mode 100644
index ca7a538..0000000
--- a/roles/monitoringservice-config/defaults/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-config/defaults/main.yml
-
-xos_admin_user: "xosadmin@opencord.org"
-xos_admin_pass: "{{ lookup('password', credentials_dir ~ '/xosadmin@opencord.org chars=ascii_letters,digits') }}"
-
-#paths
-config_cord_dir: "/opt/cord"
-head_cord_dir: "/opt/cord"
-
-head_cord_profile_dir: "/opt/cord_profile"
-
diff --git a/roles/monitoringservice-config/tasks/main.yml b/roles/monitoringservice-config/tasks/main.yml
deleted file mode 100644
index 2c0edf7..0000000
--- a/roles/monitoringservice-config/tasks/main.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-config/tasks/main.yml
-
-- name: Copy monitoringservice onboarding TOSCA files to cord_profile
-  copy:
-    src: "{{ config_cord_dir }}/orchestration/xos_services/monitoring/xos/monitoring-onboard.yaml"
-    dest: "{{ head_cord_profile_dir }}/monitoring-onboard.yaml"
-
-- name: TOSCA to mount monitoringservice volume in XOS container
-  template:
-    src: "xos-monitoringservice.yaml.j2"
-    dest: "{{ head_cord_profile_dir }}/xos-monitoringservice.yaml"
-
-- name: TOSCA files to instantiate monitoringservice
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ head_cord_profile_dir }}/{{ item }}"
-  with_items:
-    - "monitoringservice.yaml"
-    - "monitoringtenant.yaml"
-
diff --git a/roles/monitoringservice-config/templates/monitoringservice.yaml.j2 b/roles/monitoringservice-config/templates/monitoringservice.yaml.j2
deleted file mode 100644
index dc154ae..0000000
--- a/roles/monitoringservice-config/templates/monitoringservice.yaml.j2
+++ /dev/null
@@ -1,199 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Setup CORD-related services -- vOLT, vCPE, vBNG.
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/monitoring_tosca_types.yaml
-
-topology_template:
-  node_templates:
-    service_ceilometer:
-      type: tosca.nodes.CeilometerService
-      requirements:
-      properties:
-          view_url: /admin/monitoring/ceilometerservice/$id$/
-          kind: ceilometer
-          ceilometer_enable_pub_sub: true
-          public_key: { get_artifact: [ SELF, pubkey, LOCAL_FILE] }
-          private_key_fn: /opt/xos/services/monitoring/keys/monitoringservice_rsa
-      artifacts:
-          pubkey: /opt/xos/services/monitoring/keys/monitoringservice_rsa.pub
-
-#    service_sflow:
-#      type: tosca.nodes.SFlowService
-#      requirements:
-#      properties:
-#          view_url: /admin/monitoring/sflowservice/$id$/
-#          kind: sflow
-#          sflow_port: 6343
-#          sflow_api_port: 33333
-
-    Private:
-      type: tosca.nodes.NetworkTemplate
-
-    management:
-      type: tosca.nodes.network.Network.XOS
-      properties:
-          no-create: true
-          no-delete: true
-          no-update: true
-
-#    ceilometer_network:
-#      type: tosca.nodes.network.Network.XOS
-#      properties:
-#          ip_version: 4
-#          labels: ceilometer_client_access
-#      requirements:
-#          - network_template:
-#              node: Private
-#              relationship: tosca.relationships.UsesNetworkTemplate
-#          - owner:
-#              node: {{ site_name }}_ceilometer
-#              relationship: tosca.relationships.MemberOfSlice
-#          - connection:
-#              node: {{ site_name }}_ceilometer
-#              relationship: tosca.relationships.ConnectsToSlice
-
-    {{ site_name }}:
-      type: tosca.nodes.Site
-
-    trusty-server-multi-nic:
-      type: tosca.nodes.Image
-
-    ceilometer-trusty-server-multi-nic:
-      type: tosca.nodes.Image
-
-    ceilometer-service-trusty-server-multi-nic:
-      type: tosca.nodes.Image
-
-    m1.small:
-      type: tosca.nodes.Flavor
-
-    {{ site_name }}_ceilometer:
-      description: Ceilometer Proxy Slice
-      type: tosca.nodes.Slice
-      requirements:
-          - ceilometer_service:
-              node: service_ceilometer
-              relationship: tosca.relationships.MemberOfService
-          - site:
-              node: {{ site_name }}
-              relationship: tosca.relationships.MemberOfSite
-          - default_image:
-                node: ceilometer-trusty-server-multi-nic
-                relationship: tosca.relationships.DefaultImage
-          - management:
-              node: management
-              relationship: tosca.relationships.ConnectsToNetwork
-          - m1.small:
-              node: m1.small
-              relationship: tosca.relationships.DefaultFlavor
-
-    # Virtual machines
-    ceilometer_service_instance:
-      type: tosca.nodes.Compute
-      capabilities:
-        # Host container properties
-        host:
-         properties:
-           num_cpus: 2
-           disk_size: 40 GB
-           mem_size: 4 GB
-      requirements:
-          - slice:
-                node: {{ site_name }}_ceilometer
-                relationship: tosca.relationships.MemberOfSlice
-          - image:
-                node: ceilometer-service-trusty-server-multi-nic
-                relationship: tosca.relationships.UsesImage
-
-#    {{ site_name }}_sflow:
-#      description: Slice for sFlow service
-#      type: tosca.nodes.Slice
-#      requirements:
-#          - sflow_service:
-#              node: service_sflow
-#              relationship: tosca.relationships.MemberOfService
-#          - site:
-#              node: {{ site_name }}
-#              relationship: tosca.relationships.MemberOfSite
-
-# MOVING this section to monitoringtenant.yaml
-#    my_ceilometer_tenant:
-#      description: Ceilometer Service default Tenant
-#      type: tosca.nodes.CeilometerTenant
-#      requirements:
-#          - provider_service:
-#              node: service_ceilometer
-#              relationship: tosca.relationships.MemberOfService
-#          - dependency:
-#              node: ceilometer_service_instance
-#              relationship: tosca.relationships.DependsOn
-       
-    # Virtual machines
-#    sflow_service_instance:
-#      type: tosca.nodes.Compute
-#      capabilities:
-#        # Host container properties
-#        host:
-#         properties:
-#           num_cpus: 1
-#           disk_size: 10 GB
-#           mem_size: 4 MB
-#        # Guest Operating System properties
-#        os:
-#          properties:
-#            # host Operating System image properties
-#            architecture: x86_64
-#            type: linux
-#            distribution: Ubuntu
-#            version: 14.10
-#      requirements:
-#          - slice:
-#                node: {{ site_name }}_sflow
-#                relationship: tosca.relationships.MemberOfSlice
-
-# MOVING the below sections to monitoringtenant.yaml
-#    Ceilometer:
-#      type: tosca.nodes.DashboardView
-#      properties:
-#          url: template:xosCeilometerDashboard
-#    Tenant:
-#      type: tosca.nodes.DashboardView
-#      properties:
-#          no-create: true
-#          no-update: true
-#          no-delete: true
-#
-#    padmin@vicci.org:
-#      type: tosca.nodes.User
-#      properties:
-#          firstname: XOS
-#          lastname: admin
-#          is_admin: true
-#      requirements:
-#          - tenant_dashboard:
-#              node: Tenant
-#              relationship: tosca.relationships.UsesDashboard
-#          - ceilometer_dashboard:
-#              node: Ceilometer
-#              relationship: tosca.relationships.UsesDashboard
diff --git a/roles/monitoringservice-config/templates/monitoringtenant.yaml.j2 b/roles/monitoringservice-config/templates/monitoringtenant.yaml.j2
deleted file mode 100644
index f9e30c3..0000000
--- a/roles/monitoringservice-config/templates/monitoringtenant.yaml.j2
+++ /dev/null
@@ -1,70 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Setup CORD-related services -- vOLT, vCPE, vBNG.
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/monitoring_tosca_types.yaml
-
-topology_template:
-  node_templates:
-    service_ceilometer:
-      type: tosca.nodes.CeilometerService
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-    my_ceilometer_tenant:
-      description: Ceilometer Service default Tenant
-      type: tosca.nodes.CeilometerTenant
-      requirements:
-          - provider_service:
-              node: service_ceilometer
-              relationship: tosca.relationships.MemberOfService
-       
-    Ceilometer:
-      type: tosca.nodes.DashboardView
-      properties:
-          url: template:xosCeilometerDashboard
-    Tenant:
-      type: tosca.nodes.DashboardView
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-# XOS Users
-# Default admin user account
-    {{ xos_admin_user }}:
-      type: tosca.nodes.User
-      properties:
-          password: {{ xos_admin_pass }}
-          firstname: {{ xos_admin_first }}
-          lastname: {{ xos_admin_last }}
-          is_admin: true
-      requirements:
-          - tenant_dashboard:
-              node: Tenant
-              relationship: tosca.relationships.UsesDashboard
-          - ceilometer_dashboard:
-              node: Ceilometer
-              relationship: tosca.relationships.UsesDashboard
diff --git a/roles/monitoringservice-config/templates/xos-monitoringservice.yaml.j2 b/roles/monitoringservice-config/templates/xos-monitoringservice.yaml.j2
deleted file mode 100644
index e0aacfc..0000000
--- a/roles/monitoringservice-config/templates/xos-monitoringservice.yaml.j2
+++ /dev/null
@@ -1,42 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
----
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Have the XOS container mount the monitoringservice volume
-
-imports:
-   - custom_types/xos.yaml
-
-topology_template:
-  node_templates:
-
-    xos:
-      type: tosca.nodes.XOS
-
-    /opt/xos_services/monitoring:
-      type: tosca.nodes.XOSVolume
-      properties:
-          host_path: "{{ head_cord_dir }}/orchestration/xos_services/monitoring"
-          read_only: True
-      requirements:
-          - xos:
-             node: xos
-             relationship: tosca.relationships.UsedByXOS
-
diff --git a/roles/monitoringservice-enable-exampleservicemonitoring-config/tasks/main.yml b/roles/monitoringservice-enable-exampleservicemonitoring-config/tasks/main.yml
deleted file mode 100644
index 38e0464..0000000
--- a/roles/monitoringservice-enable-exampleservicemonitoring-config/tasks/main.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-
----
-# monitoringservice-enable-exampleservicemonitoring-config/tasks/main.yml
-
-- name: TOSCA files to enable exampleservice monitoring
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ cord_profile_dir }}/{{ item }}"
-  with_items:
-    - "exampleservicemonitoring.yaml"
-
diff --git a/roles/monitoringservice-enable-exampleservicemonitoring-config/templates/exampleservicemonitoring.yaml.j2 b/roles/monitoringservice-enable-exampleservicemonitoring-config/templates/exampleservicemonitoring.yaml.j2
deleted file mode 100644
index 18a0ac9..0000000
--- a/roles/monitoringservice-enable-exampleservicemonitoring-config/templates/exampleservicemonitoring.yaml.j2
+++ /dev/null
@@ -1,54 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Setup CORD-related services -- vOLT, vCPE, vBNG.
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/monitoring_tosca_types.yaml
-   - custom_types/exampleservice.yaml
-
-topology_template:
-  node_templates:
-    service_ceilometer:
-      type: tosca.nodes.CeilometerService
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-    service#exampleservice:
-      type: tosca.nodes.ExampleService
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-    exampleservice_monitoring_publisher_tenant:
-      description: Monitoring Publisher Tenant for Example service
-      type: tosca.nodes.UserServiceMonitoringPublisher
-      requirements:
-          - provider_service:
-              node: service_ceilometer
-              relationship: tosca.relationships.TenantOfService
-          - target_service:
-              node: service#exampleservice
-              relationship: tosca.relationships.PublishesMonitoringData
-
diff --git a/roles/monitoringservice-enable-exampleservicemonitoring/tasks/main.yml b/roles/monitoringservice-enable-exampleservicemonitoring/tasks/main.yml
deleted file mode 100644
index 372e6ed..0000000
--- a/roles/monitoringservice-enable-exampleservicemonitoring/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-exampleservicemonitoring/tasks/main.yml
-
-- name: Run TOSCA to enable exampleservice monitoring
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/exampleservicemonitoring.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
diff --git a/roles/monitoringservice-enable-inframonitoring-config/tasks/main.yml b/roles/monitoringservice-enable-inframonitoring-config/tasks/main.yml
deleted file mode 100644
index f4d0397..0000000
--- a/roles/monitoringservice-enable-inframonitoring-config/tasks/main.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-
----
-# monitoringservice-config/tasks/main.yml
-
-- name: TOSCA files to enable infrastructure monitoring
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ cord_profile_dir }}/{{ item }}"
-  with_items:
-    - "inframonitoring.yaml"
-    - "onos_monitoring_service_endpoints.json"
-
diff --git a/roles/monitoringservice-enable-inframonitoring-config/templates/inframonitoring.yaml.j2 b/roles/monitoringservice-enable-inframonitoring-config/templates/inframonitoring.yaml.j2
deleted file mode 100644
index 625b64f..0000000
--- a/roles/monitoringservice-enable-inframonitoring-config/templates/inframonitoring.yaml.j2
+++ /dev/null
@@ -1,92 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Auto generated file to enable monitoring of infrastructure services (OpenStack, ONOS...etc).
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/monitoring_tosca_types.yaml
-
-topology_template:
-  node_templates:
-    service_ceilometer:
-      type: tosca.nodes.CeilometerService
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-    onos_monitoring_agent_head_node:
-      description: Monitoring agent info
-      type: tosca.nodes.InfraMonitoringAgentInfo
-      properties:
-          start_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/onos/start
-          start_url_json_data: { get_artifact: [ SELF, onos_monitoring_service_endpoints, LOCAL_FILE] }
-          stop_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/onos/stop
-      artifacts:
-          onos_monitoring_service_endpoints: /opt/cord_profile/onos_monitoring_service_endpoints.json
-
-    os_monitoring_agent_head_node:
-      description: Openstack Monitoring agent info
-      type: tosca.nodes.InfraMonitoringAgentInfo
-      properties:
-          start_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/openstack/start
-          stop_url: http://ceilometer-1.cord.lab:5004/monitoring/agent/openstack/stop
-
-# OpenStack compute nodes
-{% for node in groups["compute"] %}
-    os_monitoring_agent_cp_{{ loop.index }}:
-      description: Openstack Monitoring agent info for {{ node }}
-      type: tosca.nodes.InfraMonitoringAgentInfo
-      properties:
-          start_url: http://{{ node }}:5004/monitoring/agent/openstack/start
-          stop_url: http://{{ node }}:5004/monitoring/agent/openstack/stop
-{% endfor %}
-
-    os_monitoring_collector_plugin:
-      description: Infra Monitoring collector plugin info
-      type: tosca.nodes.MonitoringCollectorPluginInfo
-      properties:
-          plugin_folder_path: /opt/xos/synchronizers/monitoring/ceilometer/ceilometer-plugins/network/ext_services/openstack_infra/
-          plugin_rabbit_exchange: openstack_infra
- 
-    openstack_monitoring_publisher_tenant:
-      description: OpenStack Monitoring Publisher Tenant
-      type: tosca.nodes.OpenStackMonitoringPublisher
-      requirements:
-          - provider_service:
-              node: service_ceilometer
-              relationship: tosca.relationships.TenantOfService
-          - monitoring_collector_plugin:
-              node: os_monitoring_collector_plugin
-              relationship: tosca.relationships.ProvidesMonitoringCollectorPluginInfo
-          - monitoring_agent_1:
-              node: os_monitoring_agent_head_node
-              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
-          - monitoring_agent_2:
-              node: onos_monitoring_agent_head_node
-              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
-{% set count = 2 %}
-{% for node in groups["compute"] %}
-          - monitoring_agent_{{ count + loop.index }}:
-              node: os_monitoring_agent_cp_{{ loop.index }}
-              relationship: tosca.relationships.ProvidesInfraMonitoringAgentInfo
-{% endfor %}
-
diff --git a/roles/monitoringservice-enable-inframonitoring-config/templates/onos_monitoring_service_endpoints.json.j2 b/roles/monitoringservice-enable-inframonitoring-config/templates/onos_monitoring_service_endpoints.json.j2
deleted file mode 100644
index bf9e497..0000000
--- a/roles/monitoringservice-enable-inframonitoring-config/templates/onos_monitoring_service_endpoints.json.j2
+++ /dev/null
@@ -1,24 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-{
-    "resources" : [
-        "onos://onos-cord.cord.lab:8182?auth=basic&user=onos&password=rocks&scheme=http",
-        "onos://onos-fabric.cord.lab:8181?auth=basic&user=onos&password=rocks&scheme=http"
-     ]
-}
diff --git a/roles/monitoringservice-enable-inframonitoring/tasks/main.yml b/roles/monitoringservice-enable-inframonitoring/tasks/main.yml
deleted file mode 100644
index f5fa084..0000000
--- a/roles/monitoringservice-enable-inframonitoring/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-inframonitoring/tasks/main.yml
-
-- name: Run TOSCA to enable infra monitoring
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/inframonitoring.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
diff --git a/roles/monitoringservice-enable-vsgmonitoring-config/tasks/main.yml b/roles/monitoringservice-enable-vsgmonitoring-config/tasks/main.yml
deleted file mode 100644
index 9b75e20..0000000
--- a/roles/monitoringservice-enable-vsgmonitoring-config/tasks/main.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-
----
-# monitoringservice-enable-vsgmonitoring-config/tasks/main.yml
-
-- name: TOSCA files to enable vSG service monitoring
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ cord_profile_dir }}/{{ item }}"
-  with_items:
-    - "vsgmonitoring.yaml"
-
diff --git a/roles/monitoringservice-enable-vsgmonitoring-config/templates/vsgmonitoring.yaml.j2 b/roles/monitoringservice-enable-vsgmonitoring-config/templates/vsgmonitoring.yaml.j2
deleted file mode 100644
index be887a9..0000000
--- a/roles/monitoringservice-enable-vsgmonitoring-config/templates/vsgmonitoring.yaml.j2
+++ /dev/null
@@ -1,52 +0,0 @@
-
-{#
-Copyright 2017-present Open Networking Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-#}
-
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-
-description: Setup CORD-related services -- vOLT, vCPE, vBNG.
-
-imports:
-   - custom_types/xos.yaml
-   - custom_types/monitoring_tosca_types.yaml
-
-topology_template:
-  node_templates:
-    service_ceilometer:
-      type: tosca.nodes.CeilometerService
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-    service#vsg:
-      type: tosca.nodes.VSGService
-      properties:
-          no-create: true
-          no-update: true
-          no-delete: true
-
-    vsg_monitoring_publisher_tenant:
-      description: vSG Monitoring Publisher Tenant
-      type: tosca.nodes.UserServiceMonitoringPublisher
-      requirements:
-          - provider_service:
-              node: service_ceilometer
-              relationship: tosca.relationships.TenantOfService
-          - target_service:
-              node: service#vsg
-              relationship: tosca.relationships.PublishesMonitoringData
diff --git a/roles/monitoringservice-enable-vsgmonitoring/tasks/main.yml b/roles/monitoringservice-enable-vsgmonitoring/tasks/main.yml
deleted file mode 100644
index dded217..0000000
--- a/roles/monitoringservice-enable-vsgmonitoring/tasks/main.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-enable-vsgmonitoring/tasks/main.yml
-
-- name: Run TOSCA to enable vSG monitoring
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/vsgmonitoring.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
diff --git a/roles/monitoringservice-instantiate/tasks/main.yml b/roles/monitoringservice-instantiate/tasks/main.yml
deleted file mode 100644
index 55cee04..0000000
--- a/roles/monitoringservice-instantiate/tasks/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-instantiate/tasks/main.yml
-
-- name: Run TOSCA to instantiate monitoringservice
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/monitoringservice.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
-- name: Run TOSCA to instantiate monitoring channel
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} /opt/cord_profile/monitoringtenant.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
diff --git a/roles/monitoringservice-onboard/defaults/main.yml b/roles/monitoringservice-onboard/defaults/main.yml
deleted file mode 100644
index c33a330..0000000
--- a/roles/monitoringservice-onboard/defaults/main.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-onboard/defaults/main.yml
-
-xos_admin_user: "xosadmin@opencord.org"
-
-# paths
-head_cord_profile_dir: "/opt/cord_profile"
-
-xos_bootstrap_ui_port: 9001
-
diff --git a/roles/monitoringservice-onboard/tasks/main.yml b/roles/monitoringservice-onboard/tasks/main.yml
deleted file mode 100644
index 7183293..0000000
--- a/roles/monitoringservice-onboard/tasks/main.yml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
----
-# monitoringservice-onboard/tasks/main.yml
-
-- name: Disable onboarding
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} {{ head_cord_profile_dir }}/disable-onboarding.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
-- name: Have XOS container mount monitoringservice volume
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} {{ head_cord_profile_dir }}/xos-monitoringservice.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
-- name: Onboard monitoringservice
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} {{ head_cord_profile_dir }}/monitoring-onboard.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
-- name: Enable onboarding
-  command: "python /opt/xos/tosca/run.py {{ xos_admin_user }} {{ head_cord_profile_dir }}/enable-onboarding.yaml"
-  tags:
-    - skip_ansible_lint # TOSCA loading should be idempotent
-
-- name: Wait for monitoring to be onboarded
-  uri:
-    url: "http://localhost:{{ xos_bootstrap_ui_port }}/api/utility/onboarding/services/monitoring/ready/"
-    method: GET
-    return_content: yes
-  register: xos_onboard_status
-  until: '"true" in xos_onboard_status.content'
-  retries: 60
-  delay: 2
-
-- name: Wait for XOS to be onboarded after monitoringservice onboarding
-  uri:
-    url: "http://localhost:{{ xos_bootstrap_ui_port }}/api/utility/onboarding/xos/ready/"
-    method: GET
-    return_content: yes
-  register: xos_onboard_status
-  until: '"true" in xos_onboard_status.content'
-  retries: 60
-  delay: 2
-