CSIT-1437 Create portable host-setup document

- Ansible simplified and optimalized
- Porting global variables into single file
- Rework the README.md
- Tested outside LF environemnt

Change-Id: I124cffa5c4510edf365e8b558da0c8c498f55d50
Signed-off-by: Peter Mikus <pmikus@cisco.com>

21 files changed, 0 insertions, 660 deletions

diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/interfaces_virl b/resources/tools/testbed-setup/ansible/roles/virl/files/interfaces_virl
deleted file mode 100644
index 25ea35a0c5..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/interfaces_virl
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file describes the network interfaces available on your system
-# and how to activate them. For more information, see interfaces(5).
-
-# The loopback network interface
-auto lo
-iface lo inet loopback
-
-# The primary network interface
-auto br1
-iface br1 inet static
-    address {{ ansible_default_ipv4["address"] }}
-    netmask {{ ansible_default_ipv4["netmask"] }}
-    gateway {{ ansible_default_ipv4["gateway"] }}
-    dns-nameservers 199.204.44.24 199.204.47.54
-    bridge_maxwait 0
-    bridge_ports eth0 eth4
-    bridge_stp off
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/nova_os_ip.patch b/resources/tools/testbed-setup/ansible/roles/virl/files/nova_os_ip.patch
deleted file mode 100644
index a943dc9b25..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/nova_os_ip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- api/metadata/base.py.old	2017-04-26 12:38:52.522991596 +0000
-+++ api/metadata/base.py	2017-04-26 10:06:46.396450566 +0000
-@@ -493,7 +493,7 @@
-                 path = 'openstack/%s/%s' % (version, VD_JSON_NAME)
-                 yield (path, self.lookup(path))
-
--            if self._check_version(LIBERTY, version, ALL_OPENSTACK_VERSIONS):
-+            if False and self._check_version(LIBERTY, version, ALL_OPENSTACK_VERSIONS):
-                 path = 'openstack/%s/%s' % (version, NW_JSON_NAME)
-                 yield (path, self.lookup(path))
- 
-
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/requirements.txt b/resources/tools/testbed-setup/ansible/roles/virl/files/requirements.txt
deleted file mode 100644
index 11caf5d563..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/requirements.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-robotframework==2.9.2
-paramiko==1.16.0
-scp==0.10.2
-ipaddress==1.0.16
-interruptingcow==0.6
-PyYAML==3.11
-pykwalify==1.5.0
-scapy==2.3.1
-enum34==1.1.2
-requests==2.9.1
-ecdsa==0.13
-pycrypto==2.6.1
-pypcap==1.1.5
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/salt.b64 b/resources/tools/testbed-setup/ansible/roles/virl/files/salt.b64
deleted file mode 100644
index 5e76a8583b..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/salt.b64
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-hoaGhoaGhsa3hH8BeOCWxQBQAAA=
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/etc/salt/minion.d/testlocal.conf b/resources/tools/testbed-setup/ansible/roles/virl/files/salt/etc/salt/minion.d/testlocal.conf
deleted file mode 100644
index fce910cc0b..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/etc/salt/minion.d/testlocal.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-file_roots:
-   base:
-     - /srv/salt/
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server.sls b/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server.sls
deleted file mode 100644
index bf3e47f9b3..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server.sls
+++ /dev/null
@@ -1,3 +0,0 @@
-include:
-  - ckoester.nfs-server.install
-  - ckoester.nfs-server.configure
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/configure.sls b/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/configure.sls
deleted file mode 100644
index ce362a38b2..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/configure.sls
+++ /dev/null
@@ -1,31 +0,0 @@
-/nfs:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 755
-
-/nfs/scratch:
-  file.directory:
-    - user: root
-    - group: root
-    - mode: 1777
-
-/nfs/ro:
-  file.directory:
-    - user: virl
-    - group: virl
-    - mode: 755
-
-/etc/exports:
-  file.managed:
-    - mode: 644
-    - template: jinja
-    - source: "salt://ckoester/nfs-server/files/exports"
-
-nfs_server_running:
-  service.running:
-    - name: nfs-kernel-server
-
-update_exports:
-  cmd.run:
-    - name: exportfs -ra
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/files/exports b/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/files/exports
deleted file mode 100644
index 23802be486..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/files/exports
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/exports: the access control list for filesystems which may be exported
-#		to NFS clients.  See exports(5).
-#
-# Example for NFSv2 and NFSv3:
-# /srv/homes       hostname1(rw,sync,no_subtree_check) hostname2(ro,sync,no_subtree_check)
-#
-# Example for NFSv4:
-# /srv/nfs4        gss/krb5i(rw,sync,fsid=0,crossmnt,no_subtree_check)
-# /srv/nfs4/homes  gss/krb5i(rw,sync,no_subtree_check)
-#
-/nfs/scratch	{{ salt['pillar.get']('virl:l2_network', salt['grains.get']('l2_network', '172.16.1.0/24' )) }}(rw,no_root_squash,no_subtree_check) {{ salt['pillar.get']('virl:l2_network2', salt['grains.get']('l2_network2', '172.16.2.0/24' )) }}(rw,no_root_squash,no_subtree_check) {{ salt['pillar.get']('virl:l3_network', salt['grains.get']('l3_network', '172.16.3.0/24' )) }}(rw,no_root_squash,no_subtree_check)
-/nfs/ro		*(ro,no_root_squash,no_subtree_check)
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/install.sls b/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/install.sls
deleted file mode 100644
index 0f136346f8..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/salt/srv/salt/ckoester/nfs-server/install.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-nfs-kernel-server install:
-  pkg.installed:
-    - skip_verify: True
-    - refresh: False
-    - name: nfs-kernel-server
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/sudoers_jenkins-in b/resources/tools/testbed-setup/ansible/roles/virl/files/sudoers_jenkins-in
deleted file mode 100644
index 1797c2c636..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/sudoers_jenkins-in
+++ /dev/null
@@ -1 +0,0 @@
-jenkins-in ALL=(root) NOPASSWD: /bin/rm -fr /scratch/*, /bin/rm -fr /nfs/scratch/*
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/sudoers_virl b/resources/tools/testbed-setup/ansible/roles/virl/files/sudoers_virl
deleted file mode 100644
index e0cf48ac10..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/sudoers_virl
+++ /dev/null
@@ -1 +0,0 @@
-virl ALL=(root) NOPASSWD:ALL
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/ttyS0 b/resources/tools/testbed-setup/ansible/roles/virl/files/ttyS0
deleted file mode 100644
index 0ed8550190..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/ttyS0
+++ /dev/null
@@ -1,10 +0,0 @@
-# ttyS0 - getty
-#
-# This service maintains a getty on ttyS0 from the point the system is
-# started until it is shut down again.
-
-start on stopped rc RUNLEVEL=[12345]
-stop on runlevel [!12345]
-
-respawn
-exec /sbin/getty -L 115200 ttyS0 vt102
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/id_rsa_virl b/resources/tools/testbed-setup/ansible/roles/virl/files/virl/id_rsa_virl
deleted file mode 100644
index b4c3de745b..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/id_rsa_virl
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpgIBAAKCAQEAwUDlTpzSHpwLQotZOFS4AgcPNEWCnP1AB2hWFmvI+8Kah/gb
-v8ruZU9RqhPs56tyKzxbhvNkY4VbH5F1GilHZu3mLqzM4KfghMmaeMEjO1T7BYYd
-vuBfTvIluljfQ2vAlnYrDwn+ClxJk81m0pDgvrLEX4qVVh2sGh7UEkYy5r82DNa2
-4VjzPB1J/c8a9zP8FoZUhYIzF4FLvRMjUADpbMXgJMsGpaZLmz95ap0Eot7vb1Cc
-1LvF97iyBCrtIOSKRKA50ZhLGjMKmOwnYU+cP5718tbproDVi6VJOo7zeuXyetMs
-8YBl9kWblWG9BqP9jctFvsmi5G7hXgq1Y8u+DwIDAQABAoIBAQC/W4E0DHjLMny7
-0bvw2YKzD0Zw3fttdB94tkm4PdZv5MybooPnsAvLaXVV0hEdfVi5kzSWNl/LY/tN
-EP1BgGphc2QgB59/PPxGwFIjDCvUzlsZpynBHe+B/qh5ExNQcVvsIOqWI7DXlXaN
-0i/khOzmJ6HncRRah1spKimYRsaUUDskyg7q3QqMWVaqBbbMvLs/w7ZWd/zoDqCU
-MY/pCI6hkB3QbRo0OdiZLohphBl2ShABTwjvVyyKL5UA4jAEneJrhH5gWVLXnfgD
-p62W5CollKEYblC8mUkPxpP7Qo277zw3xaq+oktIZhc5SUEUd7nJZtNqVAHqkItW
-79VmpKyxAoGBAPfU+kqNPaTSvp+x1n5sn2SgipzDtgi9QqNmC4cjtrQQaaqI57SG
-OHw1jX8i7L2G1WvVtkHg060nlEVo5n65ffFOqeVBezLVJ7ghWI8U+oBiJJyQ4boD
-GJVNsoOSUQ0rtuGd9eVwfDk3ol9aCN0KK53oPfIYli29pyu4l095kg11AoGBAMef
-bPEMBI/2XmCPshLSwhGFl+dW8d+Klluj3CUQ/0vUlvma3dfBOYNsIwAgTP0iIUTg
-8DYE6KBCdPtxAUEI0YAEAKB9ry1tKR2NQEIPfslYytKErtwjAiqSi0heM6+zwEzu
-f54Z4oBhsMSL0jXoOMnu+NZzEc6EUdQeY4O+jhjzAoGBAIogC3dtjMPGKTP7+93u
-UE/XIioI8fWg9fj3sMka4IMu+pVvRCRbAjRH7JrFLkjbUyuMqs3Arnk9K+gbdQt/
-+m95Njtt6WoFXuPCwgbM3GidSmZwYT4454SfDzVBYScEDCNm1FuR+8ov9bFLDtGT
-D4gsngnGJj1MDFXTxZEn4nzZAoGBAKCg4WmpUPaCuXibyB+rZavxwsTNSn2lJ83/
-sYJGBhf/raiV/FLDUcM1vYg5dZnu37RsB/5/vqxOLZGyYd7x+Jo5HkQGPnKgNwhn
-g8BkdZIRF8uEJqxOo0ycdOU7n/2O93swIpKWo5LIiRPuqqzj+uZKnAL7vuVdxfaY
-qVz2daMPAoGBALgaaKa3voU/HO1PYLWIhFrBThyJ+BQSQ8OqrEzC8AnegWFxRAM8
-EqrzZXl7ACUuo1dH0Eipm41j2+BZWlQjiUgq5uj8+yzy+EU1ZRRyJcOKzbDACeuD
-BpWWSXGBI5G4CppeYLjMUHZpJYeX1USULJQd2c4crLJKb76E8gz3Z9kN
------END RSA PRIVATE KEY-----
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/id_rsa_virl.pub b/resources/tools/testbed-setup/ansible/roles/virl/files/virl/id_rsa_virl.pub
deleted file mode 100644
index 0ef508c8a1..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/id_rsa_virl.pub
+++ /dev/null
@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDBQOVOnNIenAtCi1k4VLgCBw80RYKc/UAHaFYWa8j7wpqH+Bu/yu5lT1GqE+znq3IrPFuG82RjhVsfkXUaKUdm7eYurMzgp+CEyZp4wSM7VPsFhh2+4F9O8iW6WN9Da8CWdisPCf4KXEmTzWbSkOC+ssRfipVWHawaHtQSRjLmvzYM1rbhWPM8HUn9zxr3M/wWhlSFgjMXgUu9EyNQAOlsxeAkywalpkubP3lqnQSi3u9vUJzUu8X3uLIEKu0g5IpEoDnRmEsaMwqY7CdhT5w/nvXy1umugNWLpUk6jvN65fJ60yzxgGX2RZuVYb0Go/2Ny0W+yaLkbuFeCrVjy74P virl@tb4-virl
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/ifup b/resources/tools/testbed-setup/ansible/roles/virl/files/virl/ifup
deleted file mode 100644
index a4a743ac63..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/ifup
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-# Reload the OpenSSH server when an interface comes up, to allow it to start
-# listening on new addresses.
-
-set -e
-
-# Don't bother to restart sshd when lo is configured.
-if [ "$IFACE" = lo ]; then
-	exit 0
-fi
-
-# Only run from ifup.
-if [ "$MODE" != start ]; then
-	exit 0
-fi
-
-if [ "$IFACE" = br1 ]; then
-	/sbin/ip route delete default
-	/sbin/ip route add default via 10.30.51.1
-	/sbin/ifconfig br1:0 {{ virl_l2_ip }} netmask 255.255.255.0
-	exit 0
-fi
-
-
-exit 0
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/ssh_environment b/resources/tools/testbed-setup/ansible/roles/virl/files/virl/ssh_environment
deleted file mode 100644
index 5ec594d181..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/ssh_environment
+++ /dev/null
@@ -1 +0,0 @@
-PATH=/home/jenkins-in/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/virl-bootstrap-wrapper b/resources/tools/testbed-setup/ansible/roles/virl/files/virl/virl-bootstrap-wrapper
deleted file mode 100644
index dc7ead804d..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/files/virl/virl-bootstrap-wrapper
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/expect
-
-if ![ string equal $::env(USER) "root"] {
-  puts "Please re-run this script as root."
-  exit 1
-}
-
-log_file /tmp/virl-bootstrap.log
-set timeout 3600
-
-spawn  ./virl-bootstrap.py
-expect "Which step are you on"
-send "1\r"
-
-expect "Salt master"
-send "vsm-md.virl.info\r"
-
-expect "Which step are you on"
-send "2\r"
-
-expect "Salt id"
-send "{{ hostname }}\r"
-expect "Salt domain name"
-send "linuxfoundation.org\r"
-
-expect "Which step are you on"
-send "3\r"
-
-expect "System hostname"
-send "{{ hostname }}\r"
-expect "System Domain name"
-send "linuxfoundation.org\r"
-
-expect "Which step are you on"
-send "4\r"
-
-puts "*******************STEP 6*************************************************************************************************************************************************"
-expect "Which step are you on"
-send "6\r"
-expect "Salt installed"
-
-puts "*******************STEP 8*************************************************************************************************************************************************"
-expect "Which step are you on"
-send "8\r"
-
-expect "True"
-
-puts "*******************STEP 9*************************************************************************************************************************************************"
-expect "Which step are you on"
-send "9\r"
-
-expect "Failed:     0"
-
-puts "*******************STEP 11*************************************************************************************************************************************************"
-expect "Which step are you on"
-send "11\r"
-
-expect eof
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/tasks/02-virl-bootstrap.yaml b/resources/tools/testbed-setup/ansible/roles/virl/tasks/02-virl-bootstrap.yaml
deleted file mode 100644
index 9ffb40caaf..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/tasks/02-virl-bootstrap.yaml
+++ /dev/null
@@ -1,216 +0,0 @@
----
-  - name: install virl-bootstrap
-    git:
-        repo: 'https://github.com/VIRL-Open/virl-bootstrap.git'
-        dest: /home/virl/virl-bootstrap
-        version: xenial
-    become_user: virl
-  - name: copy vsetting file to /etc
-    shell: /usr/bin/install -m 666 /home/virl/virl-bootstrap/vsettings.ini /etc/virl.ini
-    become: yes
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT hostname {{ hostname }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT domain_name linuxfoundation.org
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT using_dhcp_on_the_public_port False
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT public_port dummy3
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT Static_IP 10.30.49.28
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT public_network 10.30.49.0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT public_netmask {{ ansible_default_ipv4["netmask"] }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT public_gateway 10.30.49.1
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT proxy False
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT ntp_server pool.ntp.org
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT first_nameserver 199.204.44.24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT second_nameserver 199.204.47.54
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_master vsm-md.virl.info
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_id {{ hostname }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_domain linuxfoundation.org
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_masterless false
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_port {{ virl_public_port }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network {{ virl_l2_network }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_mask 255.255.255.0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network_gateway {{ virl_l2_gateway }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_start_address {{ virl_l2_start }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_end_address {{ virl_l2_end }}
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_address {{ ansible_default_ipv4["address"] }}/24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT first_flat_nameserver 199.204.44.24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT second_flat_nameserver 199.204.47.54
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_port2_enabled True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_port2 dummy0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network2 172.16.2.0/24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_mask2 255.255.255.0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network_gateway2 172.16.2.1
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_start_address2 172.16.2.50
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_end_address2 172.16.2.253
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_address2 172.16.2.254/24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT first_flat2_nameserver 199.204.44.24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT second_flat2_nameserver 199.204.47.54
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_port dummy1
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_network 172.16.3.0/24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_mask 255.255.255.0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_network_gateway 172.16.3.1
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_floating_start_address 172.16.3.50
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_floating_end_address 172.16.3.253
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_address 172.16.3.254/24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT first_snat_nameserver 199.204.44.24
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT second_snat_nameserver 199.204.47.54
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT ramdisk True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT ank 19401
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT ank_live 19402
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_webservices 19399
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_user_management 19400
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_apache_port 80
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_webmux 19403
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT Start_of_serial_port_range 17000
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT End_of_serial_port_range 18000
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT serial_port 19406
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vnc_port 19407
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT location_region US
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vnc False
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT guest_account True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT user_list tb4-virl:Cisco1234
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT uwmadmin_password Cisco1234
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT password password
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT mysql_password password
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT keystone_service_token fkgjhsdflkjh
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT enable_cinder True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT cinder_file True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT cinder_size 20000
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT cinder_location /var/lib/cinder/cinder-volumes.lvm
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT dummy_int True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT this_node_is_the_controller True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_controller_hostname controller
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_controller_IP 172.16.10.250
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_port dummy2
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_IP 172.16.10.250
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_network 172.16.10.0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_netmask 255.255.255.0
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_gateway 172.16.10.1
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT iosv True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT csr1000v True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT iosxrv432 False
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT iosxrv52 False
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT iosxrv True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT nxosv True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vpagent True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT iosvl2 True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT asav True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_server True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_iperf True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_routem True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_ostinato True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT server True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_mac True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_win32 True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_win64 True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_linux True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_clients True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT ram_overcommit 2
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT web_editor True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT mitaka True
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT kilo False
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT libvirt_cpu_mode host-passthrough
-    become_user: virl
-  - command: crudini --inplace --set /etc/virl.ini DEFAULT neutron_bridge_flooding True
-    become_user: virl
-  - name: copy vinstall bootstrap wrapper script
-    template: src=files/virl/virl-bootstrap-wrapper dest=/home/virl/virl-bootstrap/virl-bootstrap-wrapper owner=virl group=virl mode=775
-    become_user: virl
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/tasks/03-virl-post-install.yaml b/resources/tools/testbed-setup/ansible/roles/virl/tasks/03-virl-post-install.yaml
deleted file mode 100644
index 58b70c9173..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/tasks/03-virl-post-install.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
----
-  - name: Add jenkins-in user
-    user: name=jenkins-in shell=/bin/bash comment="Jenkins user"
-  - name: Add jenkins-in user to sudoers
-    copy: src=files/sudoers_jenkins-in dest=/etc/sudoers.d/jenkins-in owner=root group=root mode=660
-  - name: Set Jenkins user authorized key
-    authorized_key: user=jenkins-in key="{{ lookup('file', '/home/testuser/.ssh/id_rsa.pub') }}"
-  - name: copy salt states for dnsmasq and nfs
-    synchronize: src=files/salt/ dest=/
-  - name: install NFS salt
-    shell: salt-call --local state.sls ckoester.nfs-server
-  - name: NFS symlink
-    shell: ln -s /nfs/scratch /scratch
-    args:
-      creates: /scratch
-  - name: Upate Nova CPU mode
-    ini_file: dest=/etc/nova/nova.conf section=libvirt option=cpu_mode value=host-passthrough
-  - name: Restart nova-compute service
-    service: name=nova-compute state=restarted
-  - name: Change listen interface in NTP settings
-    lineinfile: dest=/etc/ntp.conf state=present regexp='^interface listen 172.16.*' line='interface listen {{ ansible_default_ipv4["address"] }}'
-  - name: Restart NTP service
-    service: name=ntp state=restarted
-  - name: Permit SSH user environment
-    lineinfile: dest=/etc/ssh/sshd_config state=present regexp='PermitUserEnvironment.*' line='PermitUserEnvironment yes'
-  - name: Restart SSH daemon
-    service: name=ssh state=restarted
-  - name: clone csit git repository
-    git: repo=https://gerrit.fd.io/r/csit
-         dest=/home/jenkins-in/git/csit
-    become: jenkins-in
-  - name: Link testcase-infra directory
-    command: ln -sf /home/jenkins-in/git/csit/resources/tools/virl /home/jenkins-in/testcase-infra
-    args:
-      creates: /home/jenkins-in/testcase-infra
-    become: jenkins-in
-  - name: Create bin directory
-    file: path=/home/jenkins-in/bin state=directory mode=0755
-    become: jenkins-in
-  - name: Link start-testcase executable
-    command: ln -sf /home/jenkins-in/testcase-infra/bin/start-testcase /home/jenkins-in/bin/start-testcase
-    args:
-      creates: /home/jenkins-in/bin/start-testcase
-    become: jenkins-in
-  - name: Link stop-testcase executable
-    command: ln -sf /home/jenkins-in/testcase-infra/bin/stop-testcase /home/jenkins-in/bin/stop-testcase
-    args:
-      creates: /home/jenkins-in/bin/stop-testcase
-    become: jenkins-in
-  - name: Link start-testcase-DMM executable
-    command: ln -sf /home/jenkins-in/testcase-infra/bin/start-testcase-DMM /home/jenkins-in/bin/start-testcase-DMM
-    args:
-      creates: /home/jenkins-in/bin/start-testcase-DMM
-    become: jenkins-in
-  - name: Link kill-idle-testcases executable
-    command: ln -sf /home/jenkins-in/testcase-infra/bin/kill-idle-testcases /home/jenkins-in/bin/kill-idle-testcases
-    args:
-      creates: /home/jenkins-in/bin/kill-idle-testcases
-    become: jenkins-in
-  - name: Copy SSH private key
-    copy: src=files/virl/id_rsa_virl dest=/home/jenkins-in/.ssh/id_rsa_virl mode=600
-    become: jenkins-in
-  - name: Copy SSH public key
-    copy: src=files/virl/id_rsa_virl.pub dest=/home/jenkins-in/.ssh/id_rsa_virl.pub mode=644
-    become: jenkins-in
-  - name: Copy SSH environment
-    copy: src=files/virl/ssh_environment dest=/home/jenkins-in/.ssh/environment mode=644
-    become: jenkins-in
-  - name: Add ~/bin to path
-    lineinfile: dest=/home/jenkins-in/.bashrc state=present line='PATH=${HOME}/bin:$PATH'
-    become: jenkins-in
-  - name: Update own IP address in start script
-    shell: sed -i /home/jenkins-in/testcase-infra/bin/start-testcase -e 's/10.30.51.28/{{ ansible_default_ipv4["address"] }}/'
-    become: jenkins-in
-  - name: Add authorized key
-    lineinfile: dest=/home/jenkins-in/.ssh/authorized_keys line='ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD4gderzsZyoxHULjuvPHoJuKnkaGrykqtuoqs/k1/jUdxitPoY5eX2cVYqww7MiUif7zLsiXbt5mHtyxAYCluDxAuIcy1xgSZY3MpmmSqDie4A/FdVfCUqCcpf3TZKsRP0an1MNrKIe0JFZV+uU889IDRQRdboGMs3+4cn5b9fOutpv71qwFVrTm9PZbqfQonrrN8Jp4Mz3XaZDpK22xwDAWhYOZ0eV6CJWquUgbYAHE6/HHMvd0zeJKaWZCXO/1tOGOj6cjgoViHqbnCtmYCjmv/ir0IglzbUdWdOqQY5YkhnPonveV48lVKrmBipqgbDezAUQD8wOQ7HttpYpKgt jenkins-in@tb4-virl'
-    become: jenkins-in
-# All of the below will fail if VIRL user/project already exist
-  - name: Create VIRL project
-    shell: virl_uwm_client project-edit --name tb4-virl --enabled True  -i 400 -r 1024000 -c 500
-    ignore_errors: true
-    become: virl
-#  - name: Delete VIRL project user
-#    shell: virl_uwm_client user-delete --name tb4-virl
-#    ignore_errors: true
-#  - name: Recreate VIRL project user
-#    shell: virl_uwm_client user-create --name tb4-virl --role admin --project tb4-virl --set-password Cisco1234
-#    ignore_errors: true
-  - name: Create VPP flavor
-    shell: virl_uwm_client flavor-create --name vPP --ram 4096 --vcpus 2 --disk 0
-    ignore_errors: true
-    become: virl
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/tasks/04-disk-image.yaml b/resources/tools/testbed-setup/ansible/roles/virl/tasks/04-disk-image.yaml
deleted file mode 100644
index 254c05e709..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/tasks/04-disk-image.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-  - name: Create server image directory
-    file: path=/home/virl/virl-server-image state=directory mode=0755
-    become: virl
-  - name: Copy UBUNTU server image
-    copy: src=/home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-10-21_2.0-qemu dest=/home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-10-21_2.0-qemu owner=virl group=virl mode=644
-    become: virl
-  - name: Copy CENTOS server image
-    copy: src=/home/virl/virl-server-image/packer-csit-centos-7.3-1611_2017-02-23_1.4-qemu dest=/home/virl/virl-server-image/packer-csit-centos-7.3-1611_2017-02-23_1.4-qemu owner=virl group=virl mode=644
-    become: virl
-  - name: Import UBUNTU server image into glance
-    shell: virl_uwm_client image-create --subtype server --version csit-ubuntu-16.04.1_2017-10-21_2.0 --image-on-server /home/virl/virl-server-image/packer-csit-ubuntu-16.04.1_2017-10-21_2.0-qemu
-    become: virl
-  - name: Import CENTOS server image into glance
-    shell: virl_uwm_client image-create --subtype server --version csit-centos-7.3-1611_2017-02-23_1.4 --image-on-server /home/virl/virl-server-image/packer-csit-centos-7.3-1611_2017-02-23_1.4-qemu
-    become: virl
-  - name: Create common directory
-    file: path=/nfs/common state=directory mode=0755
-  - name: Create Nested VM directory
-    file: path=/nfs/common/nested-vm state=directory mode=0755
-  - name: Copy Nested VM image
-    copy: src=/home/virl/virl-server-image/csit-nested-1.6.img dest=/nfs/common/nested-vm/csit-nested-1.6.img owner=virl group=virl mode=644
-  - name: NFS symlink
-    file:
-        src: /nfs/common/nested-vm-current.img.disabled
-        dest: /nfs/common/nested-vm/csit-nested-1.6.img
-        state: link
diff --git a/resources/tools/testbed-setup/ansible/roles/virl/tasks/main.yaml b/resources/tools/testbed-setup/ansible/roles/virl/tasks/main.yaml
deleted file mode 100644
index 8bca04e163..0000000000
--- a/resources/tools/testbed-setup/ansible/roles/virl/tasks/main.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
----
-- name: Interfaces file
-  template:
-    src: "files/interfaces_virl"
-    dest: "/etc/network/interfaces owner=root group=root mode=644"
-  tags: interfaces
-
-- name: Add VIRL user
-  user:
-    name: virl
-    shell: "/bin/bash"
-    comment: "VIRL user"
-    password: "$6$mJPlK5FKLar6$xxXPP0LRhC7T1yhHtym18Z3nKZweTtfTxzi1WpvVHJ0U/Em1UWcHqfMhRApFp0rsY9jHRuL6FfeFbKPN..uDK."
-  tags: users
-
-- name: Add VIRL user to sudoers
-  copy:
-    src: "files/sudoers_virl"
-    dest: "/etc/sudoers.d/virl owner=root group=root mode=660"
-  tags: sudoers
-
-- name: Add post up for additional address
-  copy:
-    src: "files/ifup"
-    dest: "/etc/network/if-up.d/virl owner=root group=root mode=755"
-  tags: interfaces
-
-- name: Set VIRL user authorized key
-  authorized_key:
-    user: virl
-    key: "{{ lookup('file', '/home/testuser/.ssh/id_rsa.pub') }}"
-  tags: users
-
-- name: Install bridge-utils
-  apt:
-    name: "bridge-utils"
-    state: "present"
-  tags: apt-install-bridge-utils
-
-- name: Old interface naming
-  command: "ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules"
-  tags: interfaces
-
-- name: Update init for old interface naming
-  command: "update-initramfs -u"
-  tags: interfaces
-
-- name: QEMU log garbage collector
-  cron:
-    minute: "0"
-    hour: "0"
-    name: "QEMU log garbage collector"
-    job: "find /var/log/libvirt/qemu -type f -mtime +14 -name 'instance*.log' -delete"
-  tags: cron
-
-- name: VPP deb package garbage collector
-  cron:
-    minute: "0"
-    hour: "0"
-    name: "VPP deb package garbage collector"
-    job: "find /tmp -type f -atime +14 -name '*.deb' -delete"
-  tags: cron
-
-- name: VPP rpm package garbage collector
-  cron:
-    minute: "0"
-    hour: "0"
-    name: "VPP rpm package garbage collector"
-    job: "find /tmp -type f -atime +14 -name '*.rpm' -delete"
-  tags: cron
-
-- name: NFS scratch dir garbage collector
-  cron:
-    minute: "0"
-    hour: "0"
-    name: "NFS scratch dir garbage collector"
-    job: "find /nfs/scratch/ -type d -mtime +1 -name 'session-*' -exec rm -r '{}' \\;"
-  tags: cron