CSIT-597: quotas to default user, use command crudini over ini for : vs = sep and alternate salt master

altered virl.ini for eth0 being on flat port
Change-Id: I12dacc32ca3f542f18d4569947123e49d07d74ef
Signed-off-by: Ed Kern <ejk@cisco.com>

3 files changed, 108 insertions, 101 deletions

diff --git a/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml b/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml
index 037f07a8fd..f3273e2daf 100644
--- a/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml
+++ b/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml
@@ -3,107 +3,114 @@
   remote_user: virl
   tasks:
   - name: install virl-bootstrap
-    git: repo=https://github.com/VIRL-Open/virl-bootstrap.git
-         dest=/home/virl/virl-bootstrap
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=hostname value={{ hostname }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=domain_name value=linuxfoundation.org
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=using_dhcp_on_the_public_port value=False
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=public_port value={{ ansible_default_ipv4["interface"] }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=Static_IP value={{ ansible_default_ipv4["address"] }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=public_network value={{ ansible_default_ipv4["network"] }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=public_netmask value={{ ansible_default_ipv4["netmask"] }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=public_gateway value={{ ansible_default_ipv4["gateway"] }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=proxy value=False
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=ntp_server value=pool.ntp.org
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=first_nameserver value=199.204.44.24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=second_nameserver value=199.204.47.54
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=salt_master value=us-1.virl.info,us-2.virl.info,us-4.virl.info
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=salt_id value={{ hostname }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=salt_domain value=linuxfoundation.org
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=salt_masterless value=false
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_port value={{ ansible_default_ipv4["interface"] }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_network value=10.30.51.0/24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_mask value=255.255.255.0
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_network_gateway value=10.30.51.1
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_start_address value={{ virl_l2_start }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_end_address value={{ virl_l2_end }}
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_address value={{ ansible_default_ipv4["address"] }}/24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=first_flat_nameserver value=199.204.44.24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=second_flat_nameserver value=199.204.47.54
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_port2_enabled value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_port2 value=dummy0
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_network2 value=172.16.2.0/24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_mask2 value=255.255.255.0
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_network_gateway2 value=172.16.2.1
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_start_address2 value=172.16.2.50
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_end_address2 value=172.16.2.253
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l2_address2 value=172.16.2.254/24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=first_flat2_nameserver value=199.204.44.24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=second_flat2_nameserver value=199.204.47.54
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_port value=dummy1
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_network value=172.16.3.0/24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_mask value=255.255.255.0
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_network_gateway value=172.16.3.1
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_floating_start_address value=172.16.3.50
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_floating_end_address value=172.16.3.253
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=l3_address value=172.16.3.254/24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=first_snat_nameserver value=199.204.44.24
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=second_snat_nameserver value=199.204.47.54
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=ramdisk value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=ank value=19401
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=ank_live value=19402
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=virl_webservices value=19399
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=virl_user_management value=19400
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=virl_apache_port value=80
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=virl_webmux value=19403
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=Start_of_serial_port_range value=17000
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=End_of_serial_port_range value=18000
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=serial_port value=19406
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vnc_port value=19407
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=location_region value=US
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vnc value=False
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=guest_account value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=user_list value=tb4-virl:Cisco1234
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=uwmadmin_password value=Cisco1234
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=password value=password
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=mysql_password value=password
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=keystone_service_token value=fkgjhsdflkjh
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=enable_cinder value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=cinder_file value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=cinder_size value=20000
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=cinder_location value=/var/lib/cinder/cinder-volumes.lvm
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=dummy_int value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=this_node_is_the_controller value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_controller_hostname value=controller
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_controller_IP value=172.16.10.250
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_port value=dummy2
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_IP value=172.16.10.250
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_network value=172.16.10.0
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_netmask value=255.255.255.0
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=internalnet_gateway value=172.16.10.1
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=iosv value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=csr1000v value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=iosxrv432 value=False
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=iosxrv52 value=False
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=iosxrv value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=nxosv value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vpagent value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=iosvl2 value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=asav value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=lxc_server value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=lxc_iperf value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=lxc_routem value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=lxc_ostinato value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=server value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vmm_mac value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vmm_win32 value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vmm_win64 value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=vmm_linux value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=virl_clients value=True
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=ram_overcommit value=2
-  - ini_file: dest=/home/virl/virl-bootstrap/vsettings.ini section=DEFAULT option=web_editor value=True
+    git:
+        repo: 'https://github.com/VIRL-Open/virl-bootstrap.git'
+        dest: /home/virl/virl-bootstrap
+        version: xenial
   - name: copy vsetting file to /etc
     sudo: yes
     shell: cp /home/virl/virl-bootstrap/vsettings.ini /etc/virl.ini
+  - command: crudini --set /etc/virl.ini DEFAULT l2_network_gateway {{ l2_gateway }}
+  - command: crudini --set /etc/virl.ini DEFAULT hostname {{ hostname }}
+  - command: crudini --set /etc/virl.ini DEFAULT domain_name linuxfoundation.org
+  - command: crudini --set /etc/virl.ini DEFAULT using_dhcp_on_the_public_port False
+  - command: crudini --set /etc/virl.ini DEFAULT public_port dummy3
+  - command: crudini --set /etc/virl.ini DEFAULT Static_IP 10.30.49.28
+  - command: crudini --set /etc/virl.ini DEFAULT public_network 10.30.49.0
+  - command: crudini --set /etc/virl.ini DEFAULT public_netmask {{ ansible_default_ipv4["netmask"] }}
+  - command: crudini --set /etc/virl.ini DEFAULT public_gateway 10.30.49.1
+  - command: crudini --set /etc/virl.ini DEFAULT proxy False
+  - command: crudini --set /etc/virl.ini DEFAULT ntp_server pool.ntp.org
+  - command: crudini --set /etc/virl.ini DEFAULT first_nameserver 199.204.44.24
+  - command: crudini --set /etc/virl.ini DEFAULT second_nameserver 199.204.47.54
+  - command: crudini --set /etc/virl.ini DEFAULT salt_master vsm-md.virl.info
+  - command: crudini --set /etc/virl.ini DEFAULT salt_id {{ hostname }}
+  - command: crudini --set /etc/virl.ini DEFAULT salt_domain linuxfoundation.org
+  - command: crudini --set /etc/virl.ini DEFAULT salt_masterless false
+  - command: crudini --set /etc/virl.ini DEFAULT l2_port eth0
+  - command: crudini --set /etc/virl.ini DEFAULT l2_network {{ virl_l2_network }}
+  - command: crudini --set /etc/virl.ini DEFAULT l2_mask 255.255.255.0
+  - command: crudini --set /etc/virl.ini DEFAULT l2_network_gateway {{ virl_l2_gateway }}
+  - command: crudini --set /etc/virl.ini DEFAULT l2_start_address {{ virl_l2_start }}
+  - command: crudini --set /etc/virl.ini DEFAULT l2_end_address {{ virl_l2_end }}
+  - command: crudini --set /etc/virl.ini DEFAULT l2_address {{ ansible_default_ipv4["address"] }}/24
+  - command: crudini --set /etc/virl.ini DEFAULT first_flat_nameserver 199.204.44.24
+  - command: crudini --set /etc/virl.ini DEFAULT second_flat_nameserver 199.204.47.54
+  - command: crudini --set /etc/virl.ini DEFAULT l2_port2_enabled True
+  - command: crudini --set /etc/virl.ini DEFAULT l2_port2 dummy0
+  - command: crudini --set /etc/virl.ini DEFAULT l2_network2 172.16.2.0/24
+  - command: crudini --set /etc/virl.ini DEFAULT l2_mask2 255.255.255.0
+  - command: crudini --set /etc/virl.ini DEFAULT l2_network_gateway2 172.16.2.1
+  - command: crudini --set /etc/virl.ini DEFAULT l2_start_address2 172.16.2.50
+  - command: crudini --set /etc/virl.ini DEFAULT l2_end_address2 172.16.2.253
+  - command: crudini --set /etc/virl.ini DEFAULT l2_address2 172.16.2.254/24
+  - command: crudini --set /etc/virl.ini DEFAULT first_flat2_nameserver 199.204.44.24
+  - command: crudini --set /etc/virl.ini DEFAULT second_flat2_nameserver 199.204.47.54
+  - command: crudini --set /etc/virl.ini DEFAULT l3_port dummy1
+  - command: crudini --set /etc/virl.ini DEFAULT l3_network 172.16.3.0/24
+  - command: crudini --set /etc/virl.ini DEFAULT l3_mask 255.255.255.0
+  - command: crudini --set /etc/virl.ini DEFAULT l3_network_gateway 172.16.3.1
+  - command: crudini --set /etc/virl.ini DEFAULT l3_floating_start_address 172.16.3.50
+  - command: crudini --set /etc/virl.ini DEFAULT l3_floating_end_address 172.16.3.253
+  - command: crudini --set /etc/virl.ini DEFAULT l3_address 172.16.3.254/24
+  - command: crudini --set /etc/virl.ini DEFAULT first_snat_nameserver 199.204.44.24
+  - command: crudini --set /etc/virl.ini DEFAULT second_snat_nameserver 199.204.47.54
+  - command: crudini --set /etc/virl.ini DEFAULT ramdisk True
+  - command: crudini --set /etc/virl.ini DEFAULT ank 19401
+  - command: crudini --set /etc/virl.ini DEFAULT ank_live 19402
+  - command: crudini --set /etc/virl.ini DEFAULT virl_webservices 19399
+  - command: crudini --set /etc/virl.ini DEFAULT virl_user_management 19400
+  - command: crudini --set /etc/virl.ini DEFAULT virl_apache_port 80
+  - command: crudini --set /etc/virl.ini DEFAULT virl_webmux 19403
+  - command: crudini --set /etc/virl.ini DEFAULT Start_of_serial_port_range 17000
+  - command: crudini --set /etc/virl.ini DEFAULT End_of_serial_port_range 18000
+  - command: crudini --set /etc/virl.ini DEFAULT serial_port 19406
+  - command: crudini --set /etc/virl.ini DEFAULT vnc_port 19407
+  - command: crudini --set /etc/virl.ini DEFAULT location_region US
+  - command: crudini --set /etc/virl.ini DEFAULT vnc False
+  - command: crudini --set /etc/virl.ini DEFAULT guest_account True
+  - command: crudini --set /etc/virl.ini DEFAULT user_list tb4-virl:Cisco1234
+  - command: crudini --set /etc/virl.ini DEFAULT uwmadmin_password Cisco1234
+  - command: crudini --set /etc/virl.ini DEFAULT password password
+  - command: crudini --set /etc/virl.ini DEFAULT mysql_password password
+  - command: crudini --set /etc/virl.ini DEFAULT keystone_service_token fkgjhsdflkjh
+  - command: crudini --set /etc/virl.ini DEFAULT enable_cinder True
+  - command: crudini --set /etc/virl.ini DEFAULT cinder_file True
+  - command: crudini --set /etc/virl.ini DEFAULT cinder_size 20000
+  - command: crudini --set /etc/virl.ini DEFAULT cinder_location /var/lib/cinder/cinder-volumes.lvm
+  - command: crudini --set /etc/virl.ini DEFAULT dummy_int True
+  - command: crudini --set /etc/virl.ini DEFAULT this_node_is_the_controller True
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_controller_hostname controller
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_controller_IP 172.16.10.250
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_port dummy2
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_IP 172.16.10.250
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_network 172.16.10.0
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_netmask 255.255.255.0
+  - command: crudini --set /etc/virl.ini DEFAULT internalnet_gateway 172.16.10.1
+  - command: crudini --set /etc/virl.ini DEFAULT iosv True
+  - command: crudini --set /etc/virl.ini DEFAULT csr1000v True
+  - command: crudini --set /etc/virl.ini DEFAULT iosxrv432 False
+  - command: crudini --set /etc/virl.ini DEFAULT iosxrv52 False
+  - command: crudini --set /etc/virl.ini DEFAULT iosxrv True
+  - command: crudini --set /etc/virl.ini DEFAULT nxosv True
+  - command: crudini --set /etc/virl.ini DEFAULT vpagent True
+  - command: crudini --set /etc/virl.ini DEFAULT iosvl2 True
+  - command: crudini --set /etc/virl.ini DEFAULT asav True
+  - command: crudini --set /etc/virl.ini DEFAULT lxc_server True
+  - command: crudini --set /etc/virl.ini DEFAULT lxc_iperf True
+  - command: crudini --set /etc/virl.ini DEFAULT lxc_routem True
+  - command: crudini --set /etc/virl.ini DEFAULT lxc_ostinato True
+  - command: crudini --set /etc/virl.ini DEFAULT server True
+  - command: crudini --set /etc/virl.ini DEFAULT vmm_mac True
+  - command: crudini --set /etc/virl.ini DEFAULT vmm_win32 True
+  - command: crudini --set /etc/virl.ini DEFAULT vmm_win64 True
+  - command: crudini --set /etc/virl.ini DEFAULT vmm_linux True
+  - command: crudini --set /etc/virl.ini DEFAULT virl_clients True
+  - command: crudini --set /etc/virl.ini DEFAULT ram_overcommit 2
+  - command: crudini --set /etc/virl.ini DEFAULT web_editor True
+  - command: crudini --set /etc/virl.ini DEFAULT mitaka True
+  - command: crudini --set /etc/virl.ini DEFAULT kilo False
+  - command: crudini --set /etc/virl.ini DEFAULT libvirt_cpu_mode host-passthrough
+  - command: crudini --set /etc/virl.ini DEFAULT neutron_bridge_flooding True
   - 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
diff --git a/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml b/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml
index d8e25894a4..1902121b17 100644
--- a/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml
+++ b/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml
@@ -74,7 +74,7 @@
   remote_user: virl
   tasks:
   - name: Create VIRL project
-    shell: virl_uwm_client project-create --name tb4-virl --enabled True --user-password Cisco1234
+    shell: virl_uwm_client project-create --name tb4-virl --enabled True --user-password Cisco1234 -i 400 -r 1024000 -c 500
     ignore_errors: true
 #  - name: Delete VIRL project user
 #    shell: virl_uwm_client user-delete --name tb4-virl
diff --git a/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper b/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper
index e2d0a5fd08..ccb326942c 100644
--- a/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper
+++ b/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper
@@ -13,7 +13,7 @@ expect "Which step are you on"
 send "1\r"
 
 expect "Salt master"
-send "us-1.virl.info,us-2.virl.info,us-4.virl.info\r"
+send "vsm-md.virl.info\r"
 
 expect "Which step are you on"
 send "2\r"