More tweaks to setting up a target system.

clientside/tmcc/common/config/rc.mkelab

@@ -3288,7 +3288,7 @@ sub CreateDefsFile($)
     my $opsnode_hostname   = $emulabconfig{"OPSNODE"}; 
     my $fsnode_hostname    = $emulabconfig{"FSNODE"};
     my $ourdomain	   = $domain;
-    my $thishomebase       = "MyEmulab.Net";
+    my $thishomebase       = $eid;
     my $cookiesuffix       = $eid;
     my $router_ip          = ($emulabconfig{"CONFIG_SINGLECNET"} ?
 			      $outer_routerip : $bossnode_ip);
@@ -3674,10 +3674,20 @@ sub CreateDefsFile($)
 	    print OUTDEFS "PORTAL_ENABLE=1\n";
 	    print OUTDEFS "PROTOGENI_LOCALUSER=1\n";
 	}
-	if (! ($emulabconfig{"CONFIG_TARGETSYS"} eq "GENIRACK" ||
-	       $emulabconfig{"CONFIG_FEDERATED"})) {
+	# Stand alone 
+	if (!( $emulabconfig{"CONFIG_TARGETSYS"} eq "GENIRACK" ||
+	       $emulabconfig{"CLOUDLAB_FEDERATED"})) {
 	    print OUTDEFS "PROTOGENI_ISCLEARINGHOUSE=1\n";
-	    print OUTDEFS "PROTOGENI_WEBSITE=${bossnode_hostname}.${ourdomain}\n";
+	    print OUTDEFS "PROTOGENI_WEBSITE=".
+		"${bossnode_hostname}.${ourdomain}\n";
+	}
+	if ($emulabconfig{"CLOUDLAB_FEDERATED"}) {
+	    # Cloudlab Portal is allowed to access via GeniCluster API.
+	    print OUTDEFS "CLOUDLAB_FEDERATED=1\n";
+	    # IG Event Daemon.
+	    print OUTDEFS "CLUSTER_PORTAL=\"boss.emulab.net\"\n";
+	    print OUTDEFS "CLUSTER_PUBSUBD_SSLPORT=16506\n";
+	    print OUTDEFS "CLUSTER_PUBSUBD_ALTPORT=16507\n";
 	}
     }
     if ($emulabconfig{"CONFIG_FIREWALL_BOSS"}) {

configure

@@ -724,6 +724,7 @@ VPUBADDR_BASE
 LINUX_FSNODE
 PORTAL_ISPRIMARY
 PORTAL_ENABLE
+CLOUDLAB_FEDERATED
 OPSVM_MOUNTPOINT
 OPSVM_ENABLE
 NEEDMCQUERIER
@@ -5168,6 +5169,7 @@ OURTIMEZONE="America/Denver"
 NODECONSOLE="sio"
 MFSVERSION=""
 PORTAL_ENABLE=0
+CLOUDLAB_FEDERATED=0
 PORTAL_ISPRIMARY=0
 LINUX_FSNODE=0
 DHCPD_EXTRAIFS=""

configure.ac

@@ -282,6 +282,7 @@ AC_SUBST(OPSVM_ENABLE)
 AC_SUBST(OPSVM_MOUNTPOINT)
 AC_SUBST(PORTAL_ENABLE)
 AC_SUBST(PORTAL_ISPRIMARY)
+AC_SUBST(CLOUDLAB_FEDERATED)
 AC_SUBST(LINUX_FSNODE)
 AC_SUBST(VPUBADDR_BASE)
 AC_SUBST(VPUBADDR_BITLEN)
@@ -459,6 +460,7 @@ NODECONSOLE="sio"
 MFSVERSION=""
 PORTAL_ENABLE=0
 PORTAL_ISPRIMARY=0
+CLOUDLAB_FEDERATED=0
 LINUX_FSNODE=0
 DHCPD_EXTRAIFS=""
 VPUBADDR_BASE="none"

protogeni/lib/GeniCluster.pm.in

@@ -76,6 +76,7 @@ my $SUDO           = "/usr/local/bin/sudo";
 my $SSH            = "/usr/bin/ssh";
 my $WAP            = "$TB/sbin/withadminprivs";
 my $API_VERSION    = 1.0;
+my $CLOUDLAB_FEDERATED = @CLOUDLAB_FEDERATED@;
 
 #
 # Check permission. At the moment, only the Mothership can issue requests
@@ -118,7 +119,8 @@ sub CheckPermission($)
 	       $OURDOMAIN eq "wisc.cloudlab.us" ||
 	       $OURDOMAIN eq "clemson.cloudlab.us" ||
 	       $OURDOMAIN eq "utahddc.geniracks.net" ||
-	       $OURDOMAIN eq "lab.onelab.eu"));
+	       $OURDOMAIN eq "lab.onelab.eu" ||
+	       $CLOUDLAB_FEDERATED));
 
     return 0;
 }