From e6ae349af548635360216827349cfc1e1ee29cd5 Mon Sep 17 00:00:00 2001 From: Ed Kern Date: Thu, 25 May 2017 07:25:13 -0600 Subject: [PATCH] CSIT-597: added additional variables needed for virl host construction. Also converted ansible_hosts file to utf-8 because the dos format it was in was pissing me off. Change-Id: Ie436f5abc6b397d406efec6e49e0845d915f2310 Signed-off-by: Ed Kern --- resources/tools/testbed-setup/ansible_hosts | 38 +++++++++++----------- .../testbed-setup/playbooks/02-virl-bootstrap.yaml | 1 - 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/resources/tools/testbed-setup/ansible_hosts b/resources/tools/testbed-setup/ansible_hosts index 92df915cea..05e1242219 100644 --- a/resources/tools/testbed-setup/ansible_hosts +++ b/resources/tools/testbed-setup/ansible_hosts @@ -1,19 +1,19 @@ -#[tg] -#10.30.51.16 hostname=t1-tg1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.20 hostname=t2-tg1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.24 hostname=t3-tg1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 - -#[sut] -#10.30.51.17 hostname=t1-sut1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.18 hostname=t1-sut2 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.21 hostname=t2-sut1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.22 hostname=t2-sut2 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.25 hostname=t3-sut1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.26 hostname=t3-sut2 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 - -#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.51.31 virl_l2_end=10.30.51.105 ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.29 hostname=t4-virl2 virl_l2_start=10.30.51.106 virl_l2_end=10.30.51.180 ansible_python_interpreter=/usr/bin/python2.7 -#10.30.51.30 hostname=t4-virl3 virl_l2_start=10.30.51.181 virl_l2_end=10.30.51.254 ansible_python_interpreter=/usr/bin/python2.7 +#[tg] +#10.30.51.16 hostname=t1-tg1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.20 hostname=t2-tg1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.24 hostname=t3-tg1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 + +#[sut] +#10.30.51.17 hostname=t1-sut1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.18 hostname=t1-sut2 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.21 hostname=t2-sut1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.22 hostname=t2-sut2 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.25 hostname=t3-sut1 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 +#10.30.51.26 hostname=t3-sut2 isolcpus="1-17,19-35" ansible_python_interpreter=/usr/bin/python2.7 + +#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 diff --git a/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml b/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml index f3273e2daf..0178b26b8c 100644 --- a/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml +++ b/resources/tools/testbed-setup/playbooks/02-virl-bootstrap.yaml @@ -10,7 +10,6 @@ - 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 -- 2.16.6