diff options
Diffstat (limited to 'resources')
8 files changed, 135 insertions, 109 deletions
diff --git a/resources/tools/testbed-setup/README.md b/resources/tools/testbed-setup/README.md index 0a423cc953..4453d767e4 100644 --- a/resources/tools/testbed-setup/README.md +++ b/resources/tools/testbed-setup/README.md @@ -120,7 +120,7 @@ When installation is finished: ~~~ [virl] - 10.30.51.28 hostname=t4-virl1 virl_l2_start=10.30.51.31 virl_l2_end=10.30.51.105 + 10.30.51.28 hostname=t4-virl1 virl_l2_start=10.30.52.2 virl_l2_end=10.30.52.253 virl_l2_network=10.30.52.0/24 virl_l2_ip=10.30.52.254 virl_public_port=eth0 ~~~ - `ansible-playbook --ask-sudo-pass 01-host-setup.yaml` diff --git a/resources/tools/testbed-setup/ansible_hosts b/resources/tools/testbed-setup/ansible_hosts index 05e1242219..55b5a209e9 100644 --- a/resources/tools/testbed-setup/ansible_hosts +++ b/resources/tools/testbed-setup/ansible_hosts @@ -14,6 +14,6 @@ #By default, let's not touch the VIRL host. Any (unintended) configuration change on VIRL host #is a recipe for disaster. #[virl] -#10.30.51.28 hostname=t4-virl1 virl_l2_start=10.30.52.2 virl_l2_end=10.30.52.253 ansible_python_interpreter=/usr/bin/python2.7 virl_l2_gateway=10.30.52.1 virl_l2_network=10.30.52.0/24 -#10.30.51.29 hostname=t4-virl2 virl_l2_start=10.30.53.2 virl_l2_end=10.30.53.253 ansible_python_interpreter=/usr/bin/python2.7 virl_l2_gateway=10.30.53.1 virl_l2_network=10.30.53.0/24 -#10.30.51.30 hostname=t4-virl3 virl_l2_start=10.30.54.2 virl_l2_end=10.30.54.253 ansible_python_interpreter=/usr/bin/python2.7 virl_l2_gateway=10.30.54.1 virl_l2_network=10.30.54.0/24
\ No newline at end of file +#10.30.51.28 hostname=t4-virl1 virl_l2_start=10.30.52.2 virl_l2_end=10.30.52.253 ansible_python_interpreter=/usr/bin/python2.7 virl_l2_gateway=10.30.52.1 virl_l2_network=10.30.52.0/24 virl_l2_ip=10.30.52.254 virl_public_port=eth0 +#10.30.51.29 hostname=t4-virl2 virl_l2_start=10.30.53.2 virl_l2_end=10.30.53.253 ansible_python_interpreter=/usr/bin/python2.7 virl_l2_gateway=10.30.53.1 virl_l2_network=10.30.53.0/24 virl_l2_ip=10.30.53.254 virl_public_port=eth4 +#10.30.51.30 hostname=t4-virl3 virl_l2_start=10.30.54.2 virl_l2_end=10.30.54.253 ansible_python_interpreter=/usr/bin/python2.7 virl_l2_gateway=10.30.54.1 virl_l2_network=10.30.54.0/24 virl_l2_ip=10.30.54.254 virl_public_port=eth0 diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml index ff6882194e..fb9b516b6d 100644 --- a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml +++ b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml @@ -43,6 +43,8 @@ user: name=virl shell=/bin/bash comment="VIRL user" password="$6$mJPlK5FKLar6$xxXPP0LRhC7T1yhHtym18Z3nKZweTtfTxzi1WpvVHJ0U/Em1UWcHqfMhRApFp0rsY9jHRuL6FfeFbKPN..uDK." - name: Add VIRL user to sudoers copy: src=files/sudoers_virl dest=/etc/sudoers.d/virl owner=root group=root mode=660 + - name: Add post up for additional address + copy: src=files/ifup dest=/etc/network/if-up.d/virl owner=root group=root mode=755 - name: Set VIRL user authorized key authorized_key: user=virl key="{{ lookup('file', '/home/testuser/.ssh/id_rsa.pub') }}" - cron: diff --git a/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml b/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml index 0178b26b8c..938a2da454 100644 --- a/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml +++ b/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml @@ -9,107 +9,107 @@ 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 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 + shell: /usr/bin/install -m 666 /home/virl/virl-bootstrap/vsettings.ini /etc/virl.ini + - command: crudini --inplace --set /etc/virl.ini DEFAULT hostname {{ hostname }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT domain_name linuxfoundation.org + - command: crudini --inplace --set /etc/virl.ini DEFAULT using_dhcp_on_the_public_port False + - command: crudini --inplace --set /etc/virl.ini DEFAULT public_port dummy3 + - command: crudini --inplace --set /etc/virl.ini DEFAULT Static_IP 10.30.49.28 + - command: crudini --inplace --set /etc/virl.ini DEFAULT public_network 10.30.49.0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT public_netmask {{ ansible_default_ipv4["netmask"] }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT public_gateway 10.30.49.1 + - command: crudini --inplace --set /etc/virl.ini DEFAULT proxy False + - command: crudini --inplace --set /etc/virl.ini DEFAULT ntp_server pool.ntp.org + - command: crudini --inplace --set /etc/virl.ini DEFAULT first_nameserver 199.204.44.24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT second_nameserver 199.204.47.54 + - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_master vsm-md.virl.info + - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_id {{ hostname }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_domain linuxfoundation.org + - command: crudini --inplace --set /etc/virl.ini DEFAULT salt_masterless false + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_port {{ virl_public_port }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network {{ virl_l2_network }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_mask 255.255.255.0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network_gateway {{ virl_l2_gateway }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_start_address {{ virl_l2_start }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_end_address {{ virl_l2_end }} + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_address {{ ansible_default_ipv4["address"] }}/24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT first_flat_nameserver 199.204.44.24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT second_flat_nameserver 199.204.47.54 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_port2_enabled True + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_port2 dummy0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network2 172.16.2.0/24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_mask2 255.255.255.0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_network_gateway2 172.16.2.1 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_start_address2 172.16.2.50 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_end_address2 172.16.2.253 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l2_address2 172.16.2.254/24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT first_flat2_nameserver 199.204.44.24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT second_flat2_nameserver 199.204.47.54 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_port dummy1 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_network 172.16.3.0/24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_mask 255.255.255.0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_network_gateway 172.16.3.1 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_floating_start_address 172.16.3.50 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_floating_end_address 172.16.3.253 + - command: crudini --inplace --set /etc/virl.ini DEFAULT l3_address 172.16.3.254/24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT first_snat_nameserver 199.204.44.24 + - command: crudini --inplace --set /etc/virl.ini DEFAULT second_snat_nameserver 199.204.47.54 + - command: crudini --inplace --set /etc/virl.ini DEFAULT ramdisk True + - command: crudini --inplace --set /etc/virl.ini DEFAULT ank 19401 + - command: crudini --inplace --set /etc/virl.ini DEFAULT ank_live 19402 + - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_webservices 19399 + - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_user_management 19400 + - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_apache_port 80 + - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_webmux 19403 + - command: crudini --inplace --set /etc/virl.ini DEFAULT Start_of_serial_port_range 17000 + - command: crudini --inplace --set /etc/virl.ini DEFAULT End_of_serial_port_range 18000 + - command: crudini --inplace --set /etc/virl.ini DEFAULT serial_port 19406 + - command: crudini --inplace --set /etc/virl.ini DEFAULT vnc_port 19407 + - command: crudini --inplace --set /etc/virl.ini DEFAULT location_region US + - command: crudini --inplace --set /etc/virl.ini DEFAULT vnc False + - command: crudini --inplace --set /etc/virl.ini DEFAULT guest_account True + - command: crudini --inplace --set /etc/virl.ini DEFAULT user_list tb4-virl:Cisco1234 + - command: crudini --inplace --set /etc/virl.ini DEFAULT uwmadmin_password Cisco1234 + - command: crudini --inplace --set /etc/virl.ini DEFAULT password password + - command: crudini --inplace --set /etc/virl.ini DEFAULT mysql_password password + - command: crudini --inplace --set /etc/virl.ini DEFAULT keystone_service_token fkgjhsdflkjh + - command: crudini --inplace --set /etc/virl.ini DEFAULT enable_cinder True + - command: crudini --inplace --set /etc/virl.ini DEFAULT cinder_file True + - command: crudini --inplace --set /etc/virl.ini DEFAULT cinder_size 20000 + - command: crudini --inplace --set /etc/virl.ini DEFAULT cinder_location /var/lib/cinder/cinder-volumes.lvm + - command: crudini --inplace --set /etc/virl.ini DEFAULT dummy_int True + - command: crudini --inplace --set /etc/virl.ini DEFAULT this_node_is_the_controller True + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_controller_hostname controller + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_controller_IP 172.16.10.250 + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_port dummy2 + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_IP 172.16.10.250 + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_network 172.16.10.0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_netmask 255.255.255.0 + - command: crudini --inplace --set /etc/virl.ini DEFAULT internalnet_gateway 172.16.10.1 + - command: crudini --inplace --set /etc/virl.ini DEFAULT iosv True + - command: crudini --inplace --set /etc/virl.ini DEFAULT csr1000v True + - command: crudini --inplace --set /etc/virl.ini DEFAULT iosxrv432 False + - command: crudini --inplace --set /etc/virl.ini DEFAULT iosxrv52 False + - command: crudini --inplace --set /etc/virl.ini DEFAULT iosxrv True + - command: crudini --inplace --set /etc/virl.ini DEFAULT nxosv True + - command: crudini --inplace --set /etc/virl.ini DEFAULT vpagent True + - command: crudini --inplace --set /etc/virl.ini DEFAULT iosvl2 True + - command: crudini --inplace --set /etc/virl.ini DEFAULT asav True + - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_server True + - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_iperf True + - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_routem True + - command: crudini --inplace --set /etc/virl.ini DEFAULT lxc_ostinato True + - command: crudini --inplace --set /etc/virl.ini DEFAULT server True + - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_mac True + - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_win32 True + - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_win64 True + - command: crudini --inplace --set /etc/virl.ini DEFAULT vmm_linux True + - command: crudini --inplace --set /etc/virl.ini DEFAULT virl_clients True + - command: crudini --inplace --set /etc/virl.ini DEFAULT ram_overcommit 2 + - command: crudini --inplace --set /etc/virl.ini DEFAULT web_editor True + - command: crudini --inplace --set /etc/virl.ini DEFAULT mitaka True + - command: crudini --inplace --set /etc/virl.ini DEFAULT kilo False + - command: crudini --inplace --set /etc/virl.ini DEFAULT libvirt_cpu_mode host-passthrough + - command: crudini --inplace --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 7558c705ee..c31e1a3f1d 100644 --- a/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml +++ b/resources/tools/testbed-setup/playbooks/03-virl-post-install.yaml @@ -70,7 +70,7 @@ remote_user: virl tasks: - name: Create VIRL project - shell: virl_uwm_client project-create --name tb4-virl --enabled True --user-password Cisco1234 -i 400 -r 1024000 -c 500 + shell: virl_uwm_client project-edit --name tb4-virl --enabled True -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/interfaces b/resources/tools/testbed-setup/playbooks/files/interfaces index d9514e63b6..25ea35a0c5 100644 --- a/resources/tools/testbed-setup/playbooks/files/interfaces +++ b/resources/tools/testbed-setup/playbooks/files/interfaces @@ -13,5 +13,5 @@ iface br1 inet static gateway {{ ansible_default_ipv4["gateway"] }} dns-nameservers 199.204.44.24 199.204.47.54 bridge_maxwait 0 - bridge_ports eth0 + bridge_ports eth0 eth4 bridge_stp off diff --git a/resources/tools/testbed-setup/playbooks/files/virl/ifup b/resources/tools/testbed-setup/playbooks/files/virl/ifup new file mode 100755 index 0000000000..a4a743ac63 --- /dev/null +++ b/resources/tools/testbed-setup/playbooks/files/virl/ifup @@ -0,0 +1,25 @@ +#! /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/playbooks/files/virl/virl-bootstrap-wrapper b/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper index ccb326942c..dc7ead804d 100644 --- a/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper +++ b/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper @@ -43,7 +43,6 @@ puts "*******************STEP 8************************************************* expect "Which step are you on" send "8\r" -expect "Determining pillar cache" expect "True" puts "*******************STEP 9*************************************************************************************************************************************************" |