Commit 41c31ca7 authored by Leigh Stoller's avatar Leigh Stoller

Sync up some fixes to genirack and powder image baking.

parent ad7faddd
...@@ -20,7 +20,6 @@ tb-set-elabinelab-attribute TARGETSYS_ROUTER 128.82.75.65 ...@@ -20,7 +20,6 @@ tb-set-elabinelab-attribute TARGETSYS_ROUTER 128.82.75.65
tb-set-elabinelab-attribute TARGETSYS_BOSSIP 128.82.75.68 tb-set-elabinelab-attribute TARGETSYS_BOSSIP 128.82.75.68
tb-set-elabinelab-attribute TARGETSYS_OPSIP 128.82.75.69 tb-set-elabinelab-attribute TARGETSYS_OPSIP 128.82.75.69
# Geni Rack specific stuff. # Geni Rack specific stuff.
tb-set-elabinelab-attribute GENIRACK_FOAMIP 128.82.75.70
tb-set-elabinelab-attribute GENIRACK_FLOWIP 128.82.75.71 tb-set-elabinelab-attribute GENIRACK_FLOWIP 128.82.75.71
tb-set-elabinelab-attribute GENIRACK_ILOIP 128.82.75.66 tb-set-elabinelab-attribute GENIRACK_ILOIP 128.82.75.66
tb-set-elabinelab-attribute GENIRACK_CONTROLIP 128.82.75.67 tb-set-elabinelab-attribute GENIRACK_CONTROLIP 128.82.75.67
...@@ -30,9 +29,9 @@ tb-set-elabinelab-attribute NAMED_FORWARDERS "128.82.254.154,128.82.254.155,155. ...@@ -30,9 +29,9 @@ tb-set-elabinelab-attribute NAMED_FORWARDERS "128.82.254.154,128.82.254.155,155.
tb-set-elabinelab-attribute NAMED_ALSONOTIFY 155.98.32.70 tb-set-elabinelab-attribute NAMED_ALSONOTIFY 155.98.32.70
#tb-set-elabinelab-attribute ROUTABLE_IPRANGE "128.82.75.96-128.82.75.126" #tb-set-elabinelab-attribute ROUTABLE_IPRANGE "128.82.75.96-128.82.75.126"
tb-set-elabinelab-attribute GENIRACK_COUNTRY "US" tb-set-elabinelab-attribute TARGETSYS_COUNTRY "US"
tb-set-elabinelab-attribute GENIRACK_LATITUDE "36.88560" tb-set-elabinelab-attribute TARGETSYS_LATITUDE "36.88560"
tb-set-elabinelab-attribute GENIRACK_LONGITUDE "-76.30741" tb-set-elabinelab-attribute TARGETSYS_LONGITUDE "-76.30741"
# Reset to admin email later. # Reset to admin email later.
tb-set-elabinelab-attribute TARGETSYS_TBOPS "genirack-ops@flux.utah.edu" tb-set-elabinelab-attribute TARGETSYS_TBOPS "genirack-ops@flux.utah.edu"
......
...@@ -57,6 +57,75 @@ sub Install($$$) ...@@ -57,6 +57,75 @@ sub Install($$$)
UpdateFileFatal($RCCONF, \@patterns, @strings); UpdateFileFatal($RCCONF, \@patterns, @strings);
}; };
#
# Reset the mailing lists. We do this late so that we do not
# all see a bunch of email until we are really ready.
#
Phase "emaillists", "Changing target for email lists", sub {
opendir(DIR, "/etc/mail/lists") or
PhaseFail("Cannot opendir /etc/mail/lists: $!");
my @lists = grep { $_ ne "." && $_ ne ".." } readdir(DIR);
closedir(DIR);
my $ops = "powder-ops\@flux.utah.edu";
my $logs = "powder-logs\@flux.utah.edu";
foreach my $list (@lists) {
my $where;
my $fname = "/etc/mail/lists/$list";
DoneIfEdited($fname)
if (-e $fname);
DeleteFileFatal($fname)
if (-e $fname);
CreateFileFatal($fname, "# $list")
if (! -e $fname);
Phase "emaillist", "Changing target for $list", sub {
SWITCH: for ($list) {
/approval$/ && do {
$where = $ops;
last SWITCH;
};
/audit$/ && do {
$where = "powder-audit\@flux.utah.edu";
last SWITCH;
};
/automail$/ && do {
$where = $logs;
last SWITCH;
};
/errors$/ && do {
$where = "powder-errors\@flux.utah.edu";
last SWITCH;
};
/logs$/ && do {
$where = $logs;
last SWITCH;
};
/ops$/ && do {
$where = $ops;
last SWITCH;
};
/stated$/ && do {
$where = $ops;
last SWITCH;
};
/testsuite$/ && do {
$where = $logs;
last SWITCH;
};
/www$/ && do {
$where = "powder-www\@flux.utah.edu";;
last SWITCH;
};
}
AppendToFileFatal($fname, $where);
};
}
};
PhaseSucceed("Powder Fixed Setup Done"); PhaseSucceed("Powder Fixed Setup Done");
}; };
return 0; return 0;
......
...@@ -24,15 +24,15 @@ tb-set-elabinelab-attribute TARGETSYS_OPSIP 10.10.10.3 ...@@ -24,15 +24,15 @@ tb-set-elabinelab-attribute TARGETSYS_OPSIP 10.10.10.3
# Added Utah boss to avoid timeouts during setup. # Added Utah boss to avoid timeouts during setup.
tb-set-elabinelab-attribute NAMED_FORWARDERS "155.98.32.70" tb-set-elabinelab-attribute NAMED_FORWARDERS "155.98.32.70"
#tb-set-elabinelab-attribute NAMED_ALSONOTIFY 155.98.32.70 tb-set-elabinelab-attribute NAMED_ALSONOTIFY 155.98.32.70
# Turn this on to federate with the MotherShip. # Turn this on to federate with the MotherShip.
tb-set-elabinelab-attribute CLOUDLAB_FEDERATED 1 tb-set-elabinelab-attribute CLOUDLAB_FEDERATED 1
# Reset to admin email later. # These are ignored.
tb-set-elabinelab-attribute TARGETSYS_TBOPS "stoller@flux.utah.edu" tb-set-elabinelab-attribute TARGETSYS_TBOPS "powder-ops@flux.utah.edu"
tb-set-elabinelab-attribute TARGETSYS_TBLOGS "stoller@flux.utah.edu" tb-set-elabinelab-attribute TARGETSYS_TBLOGS "powder-logs@flux.utah.edu"
tb-set-elabinelab-attribute TARGETSYS_TBSTATED "stoller@flux.utah.edu" tb-set-elabinelab-attribute TARGETSYS_TBSTATED "powder-ops@flux.utah.edu"
# We make this stuff up for the site. # We make this stuff up for the site.
tb-set-elabinelab-attribute TARGETSYS_HOMEBASE POWDERFIXED tb-set-elabinelab-attribute TARGETSYS_HOMEBASE POWDERFIXED
...@@ -42,6 +42,9 @@ tb-set-elabinelab-attribute SSLCERT_STATE "Utah" ...@@ -42,6 +42,9 @@ tb-set-elabinelab-attribute SSLCERT_STATE "Utah"
tb-set-elabinelab-attribute SSLCERT_LOCALITY "Utah Powder Fixed" tb-set-elabinelab-attribute SSLCERT_LOCALITY "Utah Powder Fixed"
tb-set-elabinelab-attribute SSLCERT_ORGNAME "Utah Powder Fixed Test" tb-set-elabinelab-attribute SSLCERT_ORGNAME "Utah Powder Fixed Test"
# Use the Mothership for ntp.
tb-set-elabinelab-attribute NTPSERVER "ntp1.emulab.net"
# New way of getting a routable control address for initial XEN VMs. # New way of getting a routable control address for initial XEN VMs.
tb-set-elabinelab-role-attribute boss ROUTABLE_IP "routable" tb-set-elabinelab-role-attribute boss ROUTABLE_IP "routable"
...@@ -59,14 +62,14 @@ tb-set-elabinelab-role-attribute boss XEN_LVMNOTHINPOOL yes ...@@ -59,14 +62,14 @@ tb-set-elabinelab-role-attribute boss XEN_LVMNOTHINPOOL yes
# Remember that /q is on boss not ops (boss is the FS node). # Remember that /q is on boss not ops (boss is the FS node).
tb-set-elabinelab-role-attribute "boss" "EXTRADISKS" "ada1:/usr/testbed,ada2:/q" tb-set-elabinelab-role-attribute "boss" "EXTRADISKS" "ada1:/usr/testbed,ada2:/q"
tb-set-elabinelab-role-attribute boss XEN_EXTRADISKS "disk1:50G,disk2:50G" tb-set-elabinelab-role-attribute boss XEN_EXTRADISKS "disk1:75G,disk2:240G"
namespace eval TBCOMPAT { namespace eval TBCOMPAT {
set elabinelab_maxpcs 0 set elabinelab_maxpcs 0
set elabinelab_hardware("boss") nuc7100-vm set elabinelab_hardware("boss") nuc7100-vm
set elabinelab_nodeos("boss") FBSD112-64-STD set elabinelab_nodeos("boss") FBSD112-64-STD
set elabinelab_source_tarfile "/proj/testbed/exp/elab-opsvm/emulab-src.tar.gz" #set elabinelab_source_tarfile "/proj/testbed/exp/elab-opsvm/emulab-src.tar.gz"
set elabinelab_nodeos("xenhost") XEN49-64-POWD set elabinelab_nodeos("xenhost") XEN49-64-STD
set elabinelab_hardware("xenhost") nuc7100 set elabinelab_hardware("xenhost") nuc7100
set elabinelab_fixnodes("xenhost") nuc20 set elabinelab_fixnodes("xenhost") nuc20
} }
......
Markdown is supported
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