Commit 385e075b authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Some cleanup.

Add interface/host for foamvm
parent c86553a3
# #
# Additional stuff for setting up the geni racks. # Additional stuff for setting up the geni racks.
# #
# ILO tasks.
# Create elabman account with password and key.
# Change power on setting.
# Change logout timeout.
#
# BIOS tasks.
# Change boot order.
#
# Switch tasks: # Switch tasks:
# 2610> vlan 1 ip address 10.1.1.253/24 # 2610> vlan 1 ip address 10.1.1.253/24
# 2610> ip default-gateway 10.1.1.254 # 2610> ip default-gateway 10.1.1.254
...@@ -25,19 +17,9 @@ ...@@ -25,19 +17,9 @@
# #
# Control node image changes before it can booted. # Control node image changes before it can booted.
# fix up the interfaces file. # fix up the interfaces file.
# Add /etc/hostname . # Add /etc/hostname.
# Turn off emulab boot stuff.
# Comment out swap partition from fstab
# Blacklist hpilo hpdwt radeon
# Fix up grub.cfg (console, terminal, timeout, add /bin/sh entry).
# Add /etc/resolv.conf # Add /etc/resolv.conf
# Set Root password. # Set Root password.
# Turn off dhclient stuff?
# Add elabman account since it was blown away by prepare.
# Remove emulab-cnet-found from /etc/init/rc-sysinit.conf
#
# This has to happen after reboot. Not sure yet ...
# Remove /usr/local/etc/rc.d/zzz-inelab.sh
# #
use strict; use strict;
use libinstall; use libinstall;
...@@ -64,12 +46,15 @@ my %INTERFACES = ( ...@@ -64,12 +46,15 @@ my %INTERFACES = (
"xn1" => "inet 10.1.1.1 netmask 255.255.255.0", "xn1" => "inet 10.1.1.1 netmask 255.255.255.0",
"xn2" => "inet 10.2.1.1 netmask 255.255.255.0", "xn2" => "inet 10.2.1.1 netmask 255.255.255.0",
"xn3" => "inet 10.3.1.1 netmask 255.255.255.0", "xn3" => "inet 10.3.1.1 netmask 255.255.255.0",
# Direct connect to FOAM VM on the same node.
"xn4" => "inet 10.4.1.1 netmask 255.255.255.0",
); );
my %SWITCHES = ( my %HOSTNAMES = (
"procurve1" => "10.1.1.253", "procurve1" => "10.1.1.253",
"procurve2" => "10.2.1.253", "procurve2" => "10.2.1.253",
"procurve1-alt" => "10.3.1.253", "procurve1-alt" => "10.3.1.253",
"foamvm" => "10.4.1.5",
); );
sub Install($$$) sub Install($$$)
...@@ -232,13 +217,13 @@ sub Install($$$) ...@@ -232,13 +217,13 @@ sub Install($$$)
}; };
# #
# Add /etc/hosts and /etc/rc.conf entries for the switches. # Add /etc/hosts entries for the switches.
# #
Phase "etchosts", "Adding hosts entries for switches", sub { Phase "etchosts", "Adding hosts entries for switches", sub {
my @strings = (); my @strings = ();
foreach my $switch (keys(%SWITCHES)) { foreach my $switch (keys(%HOSTNAMES)) {
my $ip = $SWITCHES{$switch}; my $ip = $HOSTNAMES{$switch};
push(@strings, "$ip\t$switch"); push(@strings, "$ip\t$switch");
} }
DoneIfEdited($HOSTS); DoneIfEdited($HOSTS);
...@@ -259,6 +244,7 @@ sub Install($$$) ...@@ -259,6 +244,7 @@ sub Install($$$)
my @strings = (); my @strings = ();
my @ifaces = (); my @ifaces = ();
# /etc/rc.conf entries for the switches.
foreach my $iface (keys(%INTERFACES)) { foreach my $iface (keys(%INTERFACES)) {
my $line = $INTERFACES{$iface}; my $line = $INTERFACES{$iface};
push(@strings, "ifconfig_${iface}=\"$line\""); push(@strings, "ifconfig_${iface}=\"$line\"");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment