Changeset 8d4e4fb for fedkit/prep_gateway.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/prep_gateway.pl (modified) (2 diffs)

fedkit/prep_gateway.pl

@@ -10 +10 @@
 my $tunnelip;
 my $peer;
-
-exit(20) unless GetOptions('ssh_pubkey=s' => \$ssh_pubkey,
+my $use_file;
+my %opts = (
+    'ssh_pubkey=s' => \$ssh_pubkey,
     'tunnelip' => \$tunnelip,
     'peer=s' => \$peer,
+    'use_file' => \$use_file,
 );
+
+exit(20) unless GetOptions(%opts);
+
+gateway_lib::read_config(gateway_lib::emulab_config_filename(), \%opts)
+    if $use_file;
 
 gateway_lib::set_sshd_params( 
@@ -64 +71 @@
 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