diff --git a/abc.yml b/abc.yml
deleted file mode 100644
index e1c7c45..0000000
--- a/abc.yml
+++ /dev/null
@@ -1,75 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.255.20.1/24'
-external_ip: '10.255.21.2/24'
-external_gw: '10.255.21.254'
-external_iface: 'eno3'
-management_network: 10.255.20.0/24
-
-deploy_docker_registry: "10.255.21.2:5000"
-
-headnode: cord@10.255.21.2
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_google/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-password_compute_node: ubuntu
-password_maas_admin: admin
-password_maas_user: cord
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.255.21.2
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/calix-pod1.yml b/calix-pod1.yml
deleted file mode 100644
index 39a8ddf..0000000
--- a/calix-pod1.yml
+++ /dev/null
@@ -1,71 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.66.12.7/24'
-external_gw: '10.66.12.20'
-external_iface: 'ens255f1'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.66.12.7:5000"
-
-headnode: cord@10.66.12.7
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.66.12.7
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/flex-pod1.yml b/flex-pod1.yml
deleted file mode 100644
index 7ea6087..0000000
--- a/flex-pod1.yml
+++ /dev/null
@@ -1,71 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.192.4.62/24'
-external_gw: '10.192.4.1'
-external_iface: 'enp4s0f1'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.192.4.62:5000"
-
-headnode: cord@10.192.4.62
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_new/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.192.4.62
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/flex-pod2.yml b/flex-pod2.yml
deleted file mode 100644
index 88c0ef2..0000000
--- a/flex-pod2.yml
+++ /dev/null
@@ -1,74 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.192.20.62/24'
-external_gw: '10.192.20.1'
-external_iface: 'eno1'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.192.20.62:5000"
-
-headnode: cord@10.192.20.62
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# set which interfaces to use for fabric/mgmt network
-fabric_include_module_types: 'ixgbe'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.192.20.62
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/nttcomm-pod1.yml b/nttcomm-pod1.yml
deleted file mode 100644
index 9db156f..0000000
--- a/nttcomm-pod1.yml
+++ /dev/null
@@ -1,75 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '192.168.18.61/24'
-external_gw: '192.168.18.251'
-external_iface: 'eno1'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "192.168.18.61:5000"
-
-headnode: cord@192.168.18.61
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# Node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Extra network config
-fabric_include_names: 'eth4'
-management_ignore_names: 'eth0,eth1,eth3,eth4,eth5'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 192.168.18.61
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/ntteast-pod1.yml b/ntteast-pod1.yml
deleted file mode 100644
index 6e25233..0000000
--- a/ntteast-pod1.yml
+++ /dev/null
@@ -1,76 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '192.168.99.61/24'
-external_gw: '192.168.99.1'
-external_iface: 'eno1'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "192.168.99.61:5000"
-
-headnode: cord@192.168.99.61
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# Node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Extra network config
-fabric_include_names: 'ens3f0'
-management_include_names: 'eno2'
-management_ignore_names: 'ens3f0,ens3f1,ens6f0,ens6f1'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 192.168.99.61
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/onf-abc.yml b/onf-abc.yml
deleted file mode 100644
index a789ce2..0000000
--- a/onf-abc.yml
+++ /dev/null
@@ -1,75 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.255.20.1/24'
-external_ip: '10.255.21.2/24'
-external_gw: '10.255.21.254'
-external_iface: 'eno3'
-management_network: 10.255.20.0/24
-
-deploy_docker_registry: "10.255.21.2:5000"
-
-headnode: cord@10.255.21.2
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-password_compute_node: ubuntu
-password_maas_admin: admin
-password_maas_user: cord
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.255.21.2
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/onlab-ecord-global.yml b/onlab-ecord-global.yml
deleted file mode 100644
index 5bc0507..0000000
--- a/onlab-ecord-global.yml
+++ /dev/null
@@ -1,58 +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.
-
-# POD config for ONF E-CORD POD, E-CORD global
-cord_scenario: single
-cord_profile: ecord-global
-
-# Variables
-config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_global_profile' ) | realpath }}"
-
-start_xos_prereqs:
-  - deploy-onos
-
-vagrant_vms: []
-
-cord_config_prereqs:
-  - config-ssh-key
-
-copy_cord_prereqs:
-  - config-ssh-key
-
-prep_buildnode_prereqs:
-  - copy-cord
-  - copy-config
-
-headnode: cord@10.90.1.10
-buildnode: cord@10.90.1.10
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    head1:
-      ansible_host: 10.90.1.10
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  head:
-    head1:
-      ansible_host: 10.90.1.10
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/onlab-ecord-local-pod1.yml b/onlab-ecord-local-pod1.yml
deleted file mode 100644
index 6a12d97..0000000
--- a/onlab-ecord-local-pod1.yml
+++ /dev/null
@@ -1,71 +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.
-
-# POD config for ONF E-CORD POD, E-CORD local POD 1
-cord_scenario: cord
-cord_profile: ecord
-
-# Variables
-config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod1_profile' ) | realpath }}"
-
-# path created on local system, mounted into corddev by Vagrant
-host_cord_profile_dir: "/var/jenkins_home/workspace/onf_ecord_local_pod1_profile"
-
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.90.1.30/16'
-external_gw: '10.90.0.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.90.1.30:5000"
-
-vagrant_vms:
-  - 'corddev'
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# headnode to ssh to for some make tasks
-headnode: cord@10.90.1.30
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.90.1.30
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
-
-#Prefix for the domainId
-carrierethernet_domainid_prefix: 10.90.1.30
-
diff --git a/onlab-ecord-local-pod2.yml b/onlab-ecord-local-pod2.yml
deleted file mode 100644
index 4357433..0000000
--- a/onlab-ecord-local-pod2.yml
+++ /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.
-
-# POD config for ONF E-CORD POD, E-CORD local POD 2
-cord_scenario: cord
-cord_profile: ecord
-
-# Variables
-config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod2_profile' ) | realpath }}"
-
-# path created on local system, mounted into corddev by Vagrant
-host_cord_profile_dir: "/var/jenkins_home/workspace/onf_ecord_local_pod2_profile"
-
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.90.1.50/16'
-external_gw: '10.90.0.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.90.1.50:5000"
-
-vagrant_vms:
-  - 'corddev'
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# headnode to ssh to for some make tasks
-headnode: cord@10.90.1.50
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.90.1.50
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
-
-#Prefix for the domainId
-carrierethernet_domainid_prefix: 10.90.1.50
diff --git a/onlab-ecord-local-pod3.yml b/onlab-ecord-local-pod3.yml
deleted file mode 100644
index 4c6ed07..0000000
--- a/onlab-ecord-local-pod3.yml
+++ /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.
-
-# POD config for ONF E-CORD POD, E-CORD local POD 3
-cord_scenario: cord
-cord_profile: ecord
-
-# Variables
-config_cord_profile_dir: "{{ ( playbook_dir ~ '/../../../onf_ecord_local_pod3_profile' ) | realpath }}"
-
-# path created on local system, mounted into corddev by Vagrant
-host_cord_profile_dir: "/var/jenkins_home/workspace/onf_ecord_local_pod3_profile"
-
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.90.1.70/16'
-external_gw: '10.90.0.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.90.1.70:5000"
-
-vagrant_vms:
-  - 'corddev'
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# headnode to ssh to for some make tasks
-headnode: cord@10.90.1.70
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.90.1.70
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
-
-#Prefix for the domainId
-carrierethernet_domainid_prefix: 10.90.1.70
diff --git a/onlab-mcord-cavium-pod1.yml b/onlab-mcord-cavium-pod1.yml
deleted file mode 100644
index 86dc059..0000000
--- a/onlab-mcord-cavium-pod1.yml
+++ /dev/null
@@ -1,77 +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.
-
-# This file is for M-CORD 5.0 
-
-cord_scenario: cord
-cord_profile: mcord-cavium
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.90.2.10/16'
-external_gw: '10.90.0.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-fabric_include_module_types: 'ixgbe'
-fabric_exclude_module_types: 'igb'
-management_include_module_types: 'igb'
-management_exclude_module_types: 'ixgbe'
-
-deploy_docker_registry: "10.90.2.10:5000"
-
-headnode: cord@10.90.2.10
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.90.2.10
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/onlab-mcord-p4-pod1.yml b/onlab-mcord-p4-pod1.yml
deleted file mode 100644
index f70c9b1..0000000
--- a/onlab-mcord-p4-pod1.yml
+++ /dev/null
@@ -1,76 +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.
-
-cord_scenario: cord
-cord_profile: mcord-ng40
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.92.0.20/24'
-external_gw: '10.92.0.1'
-external_iface: 'enp8s0f0'
-management_network: 10.6.0.0/24
-management_exclude_names: 'enp8s0f0'
-fabric_include_module_types: 'ixgbe'
-fabric_exclude_module_types: 'igb'
-management_include_module_types: 'igb'
-management_exclude_module_types: 'ixgbe'
-
-deploy_docker_registry: "10.92.0.20:5000"
-
-headnode: cord@10.92.0.20
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.92.0.20
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/onlab-mcord-pod1.yml b/onlab-mcord-pod1.yml
deleted file mode 100644
index 361c014..0000000
--- a/onlab-mcord-pod1.yml
+++ /dev/null
@@ -1,75 +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.
-
-cord_scenario: cord
-cord_profile: mcord-ng40
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.90.2.10/16'
-external_gw: '10.90.0.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-fabric_include_names: 'eth2,eth3'
-fabric_exclude_names: 'eth0,eth1'
-management_include_names: 'eth1'
-management_exclude_names: 'eth0,eth2,eth3'
-
-deploy_docker_registry: "10.90.2.10:5000"
-
-headnode: cord@10.90.2.10
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.90.2.10
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/onlab.yml b/onlab.yml
deleted file mode 100644
index eabdc84..0000000
--- a/onlab.yml
+++ /dev/null
@@ -1,75 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.90.0.251/24'
-external_gw: '10.90.0.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.90.0.251:5000"
-
-headnode: cord@10.90.0.251
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-password_compute_node: ubuntu
-password_maas_admin: admin
-password_maas_user: cord
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.90.0.251
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/qct-pod1.yml b/qct-pod1.yml
deleted file mode 100644
index c014809..0000000
--- a/qct-pod1.yml
+++ /dev/null
@@ -1,73 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.11/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth2'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.11:5000"
-
-headnode: cord@10.201.101.11
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_new/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-management_ignore_names: 'eth0'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.11
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/qct-pod2-dpdk.yml b/qct-pod2-dpdk.yml
deleted file mode 100644
index 4a5dd36..0000000
--- a/qct-pod2-dpdk.yml
+++ /dev/null
@@ -1,83 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.21/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth2'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.21:5000"
-
-headnode: cord@10.201.101.21
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-management_ignore_names: 'eth0'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.21
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
-
-# Experimental: DPDK config options
-enable_dpdk: True
-vcpu_pin_set: '4-7'
-kernel_opts: '''isolcpus=2-7 nohz_full=2-7 rcu_nocbs=2-7'''
-hugepages: '75%' # make sure %hugepages enough for ovs and VMs
-dpdk_socket_memory: '1024,0' # single numa else 1024,1024 # make sure %hugepages enough for ovs and VMs
-dpdk_lcore_mask: '0x4' # core2
-fabric_interfaces: 'eth2' # not sure abt which is the fabric interface
-pmd_cpu_mask: '0x8' # core3
diff --git a/qct-pod2.yml b/qct-pod2.yml
deleted file mode 100644
index 1878517..0000000
--- a/qct-pod2.yml
+++ /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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.21/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth0'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.21:5000"
-
-headnode: cord@10.201.101.21
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# set which interfaces to use for fabric/mgmt network
-fabric_include_names: 'eth2'
-management_exclude_names: 'eth0,eth2'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.21
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
-
diff --git a/qct-pod3-ecord-global.yml b/qct-pod3-ecord-global.yml
deleted file mode 100644
index a14f616..0000000
--- a/qct-pod3-ecord-global.yml
+++ /dev/null
@@ -1,64 +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.
-
-# POD config for QCT POD3, E-CORD global
-cord_scenario: single
-cord_profile: ecord-global
-
-start_xos_prereqs:
-  - deploy-onos
-
-vagrant_vms: []
-
-cord_config_prereqs:
-  - config-ssh-key
-
-copy_cord_prereqs:
-  - config-ssh-key
-
-prep_buildnode_prereqs:
-  - copy-cord
-  - copy-config
-
-headnode: cord@10.201.101.31
-buildnode: cord@10.201.101.31
-
-# node topology
-# this is unusual, but needed because we're running a "single" scenario on a physical node instead of a VM
-physical_node_list:
-  - name: cord-head-03
-    ipv4_last_octet: 1
-    aliases:
-      - head
-      - head1
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    head1:
-      ansible_host: 10.201.101.31
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  head:
-    head1:
-      ansible_host: 10.201.101.31
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/qct-pod3-ecord-local.yml b/qct-pod3-ecord-local.yml
deleted file mode 100644
index 5151df7..0000000
--- a/qct-pod3-ecord-local.yml
+++ /dev/null
@@ -1,67 +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.
-
-cord_scenario: cord
-cord_profile: ecord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.31/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth2'
-management_network: 10.6.0.0/24
-management_ignore_names: 'eth0'
-
-deploy_docker_registry: "10.201.101.31:5000"
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_new/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# headnode to ssh to for some make tasks
-headnode: cord@10.201.101.31
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.31
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/qct-pod3.yml b/qct-pod3.yml
deleted file mode 100644
index eeecbe5..0000000
--- a/qct-pod3.yml
+++ /dev/null
@@ -1,73 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.31/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth2'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.31:5000"
-
-headnode: cord@10.201.101.31
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_new/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-management_ignore_names: 'eth0'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.31
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/qct-pod4-mcord.yml b/qct-pod4-mcord.yml
deleted file mode 100644
index 15f9c8c..0000000
--- a/qct-pod4-mcord.yml
+++ /dev/null
@@ -1,73 +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.
-
-cord_scenario: cord
-cord_profile: mcord-cavium
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.41/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth2'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.41:5000"
-
-headnode: cord@10.201.101.41
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_new/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-management_ignore_names: 'eth0'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.41
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute:
diff --git a/qct-pod4.yml b/qct-pod4.yml
deleted file mode 100644
index 88b38ca..0000000
--- a/qct-pod4.yml
+++ /dev/null
@@ -1,73 +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.
-
-cord_scenario: cord
-cord_profile: rcord
-
-vagrant_vms:
-  - 'corddev'
-
-# Variables
-fabric_ip: '10.6.1.1/24'
-management_ip: '10.6.0.1/24'
-external_ip: '10.201.101.41/24'
-external_gw: '10.201.101.1'
-external_iface: 'eth2'
-management_network: 10.6.0.0/24
-
-deploy_docker_registry: "10.201.101.41:5000"
-
-headnode: cord@10.201.101.41
-
-# NOTE: The `host_cord_profile_dir` variable below is the path to the cord_profile dir that
-# gets mounted to corddev VM.This `cord_profile` dir typically lives in a directory
-# one level up from the `cord` directory
-host_cord_profile_dir: "/var/jenkins_home_new/workspace/cord_profile"
-
-build_targets:
-  - 'setup-automation'
-
-copy_cord_prereqs:
-  - 'config-ssh-key'
-
-skipTags:
-  - 'set_compute_node_password'
-
-# Wait until headnode prepped before building containers, for consistent DNS
-docker_images_prereqs:
-  - 'prep-headnode'
-
-# node topology
-physical_node_list:
-  - name: head1
-    aliases:
-      - head
-
-management_ignore_names: 'eth0'
-
-# Inventory for ansible, used to generate inventory.ini
-inventory_groups:
-  config:
-    localhost:
-      ansible_connection: local
-  build:
-    corddev:
-  head:
-    head1:
-      ansible_host: 10.201.101.41
-      ansible_port: 22
-      ansible_user: cord
-      ansible_ssh_pass: cord
-  compute: