Changeset d38ff56

Timestamp:

May 25, 2010 5:42:25 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

b10375f

Parents:

479a7d9

Message:

More flexible and useful gateway aliasing.

File:

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

fedkit/federate.pl

@@ -24 +24 @@
 my %services;
 my %aliases;
-my @added;
+my %added;
 my $perl;
 
@@ -95 +95 @@
     /Service:\s+(.*)/i && do { $services{$1}++;};
     /PortalAlias:\s+(.*)/i && do { $aliases{$1}++;};
-    /AddedNode:\s+(.*)/i && do { push(@added, $1); };
-}
-
-# If nodes have been added with this name, do not alias the name to the portal
-for my $a (@added) {
-    chomp $a;
-    delete $aliases{$a} if $aliases{$a};
+    /AddedNode:\s+(.*)/i && do { $added{$1}++; };
 }
 $client->close();
@@ -123 +117 @@
     print $new_hosts $_;
 }
+print $new_hosts "\n";
 $config_hosts->close();
 
 # Add gateway aliases
-if (%aliases) {
-    if ( my $hent = gethostbyname($gateway) ) {
-        my $gwip = inet_ntoa($hent->addr_list->[0]);
-
-        for my $k (keys %aliases) {
-            if ($exp && $proj) {
-                print $new_hosts "\n$gwip\t$k.$exp.$proj $k\n";
-            }
-            else {
-                print $new_hosts "\n$gwip\t$k\n";
-            }
-        }
-    }
+for my $k (keys %aliases) {
+    # If we added a node, it's a node without a local address.  Bind the name
+    # to the IP in /etc/hosts.  If we didn't add a node, it's the gateway node.
+    (my $lname = $gateway) =~ s/^[^\.]+/$k/;
+    my $ip = gateway_lib::get_ip($added{$k} ? $lname : $gateway);
+    if ($ip) { 
+        # We have an IP.  Make a hosts entry for teh key and the key plus the
+        # first two subdomains (which is an emulab setup)
+        my @x = split(/\./, $lname);
+        if (@x > 3 ) { splice(@x, 3); }
+        my $out = join(".", @x);
+        print $new_hosts "$ip\t$out $k\n";
+    }
+    else { print $new_hosts "# Can't get ip for $lname\n"; }
 }
 $new_hosts->close();