From 7e55d364fd88bb462c7211209f5cbb5bbae3a68c Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Sat, 14 May 2016 18:38:48 -0400 Subject: VPP-63: clean up config scripts, remove specific hostnames Change-Id: Ifb77256fa691b1a90045a10448835c09b764e74f Signed-off-by: Dave Barach --- vnet/etc/scripts/dhcp/dhcpd.conf | 8 ++++++++ vnet/etc/scripts/dhcp/left-ping-target.sh | 4 ++++ vnet/etc/scripts/dhcp/leftpeer.conf | 17 +++++++++++++++++ vnet/etc/scripts/dhcp/ludd-cluster-1 | 17 ----------------- vnet/etc/scripts/dhcp/ludd-cluster-2-sh | 4 ---- vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf | 8 -------- vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server | 3 --- 7 files changed, 29 insertions(+), 32 deletions(-) create mode 100644 vnet/etc/scripts/dhcp/dhcpd.conf create mode 100644 vnet/etc/scripts/dhcp/left-ping-target.sh create mode 100644 vnet/etc/scripts/dhcp/leftpeer.conf delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-1 delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-2-sh delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf delete mode 100644 vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server (limited to 'vnet/etc/scripts/dhcp') diff --git a/vnet/etc/scripts/dhcp/dhcpd.conf b/vnet/etc/scripts/dhcp/dhcpd.conf new file mode 100644 index 00000000000..d4cb3ed718a --- /dev/null +++ b/vnet/etc/scripts/dhcp/dhcpd.conf @@ -0,0 +1,8 @@ +# add at the bottom + +subnet 192.168.0.0 netmask 255.255.0.0 { + range 192.168.1.10 192.168.1.254; + option routers 192.168.1.1; + default-lease-time 15; + max-lease-time 15; +} diff --git a/vnet/etc/scripts/dhcp/left-ping-target.sh b/vnet/etc/scripts/dhcp/left-ping-target.sh new file mode 100644 index 00000000000..2edc2a50eaa --- /dev/null +++ b/vnet/etc/scripts/dhcp/left-ping-target.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +# to obtain dhcp address from leftpeer +dhclient -d -v eth1 diff --git a/vnet/etc/scripts/dhcp/leftpeer.conf b/vnet/etc/scripts/dhcp/leftpeer.conf new file mode 100644 index 00000000000..458eecf0caf --- /dev/null +++ b/vnet/etc/scripts/dhcp/leftpeer.conf @@ -0,0 +1,17 @@ +set int ip table GigabitEthernet2/2/0 12 +set int ip address GigabitEthernet2/2/0 192.168.1.1/24 +set int state GigabitEthernet2/2/0 up + +set int ip table GigabitEthernet2/7/0 11 +set int ip address GigabitEthernet2/7/0 192.168.2.1/24 +set int state GigabitEthernet2/7/0 up + +comment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 } + +comment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 } + +ip route add 0.0.0.0/24 table 11 via local +ip route add 255.255.255.255/24 table 11 via local + +ip route add 0.0.0.0/24 table 12 via local +ip route add 255.255.255.255/24 table 12 via local diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-1 b/vnet/etc/scripts/dhcp/ludd-cluster-1 deleted file mode 100644 index 458eecf0caf..00000000000 --- a/vnet/etc/scripts/dhcp/ludd-cluster-1 +++ /dev/null @@ -1,17 +0,0 @@ -set int ip table GigabitEthernet2/2/0 12 -set int ip address GigabitEthernet2/2/0 192.168.1.1/24 -set int state GigabitEthernet2/2/0 up - -set int ip table GigabitEthernet2/7/0 11 -set int ip address GigabitEthernet2/7/0 192.168.2.1/24 -set int state GigabitEthernet2/7/0 up - -comment { set dhcp proxy server 1.2.3.4 src-address 1.2.3.5 add-option-82 rx-fib-id 0 server-fib-id 0 } - -comment { set dhcp proxy server 192.168.2.2 src-address 192.168.2.1 add-option-82 rx-fib-id 12 server-fib-id 11 } - -ip route add 0.0.0.0/24 table 11 via local -ip route add 255.255.255.255/24 table 11 via local - -ip route add 0.0.0.0/24 table 12 via local -ip route add 255.255.255.255/24 table 12 via local diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-2-sh b/vnet/etc/scripts/dhcp/ludd-cluster-2-sh deleted file mode 100644 index 32924ecc5e5..00000000000 --- a/vnet/etc/scripts/dhcp/ludd-cluster-2-sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# to obtain dhcp address from ludd-cluster-1 -dhclient -d -v eth1 diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf b/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf deleted file mode 100644 index d4cb3ed718a..00000000000 --- a/vnet/etc/scripts/dhcp/ludd-cluster-5-dhcpd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# add at the bottom - -subnet 192.168.0.0 netmask 255.255.0.0 { - range 192.168.1.10 192.168.1.254; - option routers 192.168.1.1; - default-lease-time 15; - max-lease-time 15; -} diff --git a/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server b/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server deleted file mode 100644 index 6fafc1eec13..00000000000 --- a/vnet/etc/scripts/dhcp/ludd-cluster-5-isc-dhcp-server +++ /dev/null @@ -1,3 +0,0 @@ -# add eth6 to interfaces - -INTERFACES="eth6" -- cgit 1.2.3-korg