Changeset 8d4e4fb for fedkit/active_config.pl

Timestamp:

Feb 10, 2010 10:29:18 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

bbd0039

Parents:

b73cc45

Message:

Add support for parameters via files in a standard emulab location

Also moved combo_active.pl to combo.pl and added support for passive gateways.

File:

• fedkit/active_config.pl (modified) (3 diffs)

fedkit/active_config.pl

@@ -15 +15 @@
 my $fedkit_dir= "/usr/local/federation";
 my $perl = "/usr/bin/perl";
-my $iface_file;
+my $iface_file = "/var/emulab/boot/ifmap";
 my $ssh = "/usr/bin/ssh";
+my $use_file;
 
-exit(20) unless GetOptions(
+my %opts = (
     'ssh_pubkey=s' => \$ssh_pubkey,
     'ssh_privkey=s' => \$ssh_privkey,
@@ -27 +28 @@
     'interfaces=s' => \$iface_file,
     'ssh=s' => \$ssh,
+    'use_file' => \$use_file,
 );
 
+exit(20) unless GetOptions(%opts);
+
+gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+    if $use_file;
 
 my $tunnelparam = $tunnelip ? '--tunnelip' : '';
@@ -109 +115 @@
 connectivity information
 
+=item B<use_file>
+
+If given read additional parameters from the file in
+/proj/I<project>/exp/I<experiment/tmp/I<hostname>.gw/conf where those are the
+current testbed project and experiment and the hostname is before the first
+dot.  The file is option: value.
+
+
 =back