Commit d1d3c532 authored by Leigh Stoller's avatar Leigh Stoller

More tweaks to setting up a target system.

parent f8a103a6
...@@ -3288,7 +3288,7 @@ sub CreateDefsFile($) ...@@ -3288,7 +3288,7 @@ sub CreateDefsFile($)
my $opsnode_hostname = $emulabconfig{"OPSNODE"}; my $opsnode_hostname = $emulabconfig{"OPSNODE"};
my $fsnode_hostname = $emulabconfig{"FSNODE"}; my $fsnode_hostname = $emulabconfig{"FSNODE"};
my $ourdomain = $domain; my $ourdomain = $domain;
my $thishomebase = "MyEmulab.Net"; my $thishomebase = $eid;
my $cookiesuffix = $eid; my $cookiesuffix = $eid;
my $router_ip = ($emulabconfig{"CONFIG_SINGLECNET"} ? my $router_ip = ($emulabconfig{"CONFIG_SINGLECNET"} ?
$outer_routerip : $bossnode_ip); $outer_routerip : $bossnode_ip);
...@@ -3674,10 +3674,20 @@ sub CreateDefsFile($) ...@@ -3674,10 +3674,20 @@ sub CreateDefsFile($)
print OUTDEFS "PORTAL_ENABLE=1\n"; print OUTDEFS "PORTAL_ENABLE=1\n";
print OUTDEFS "PROTOGENI_LOCALUSER=1\n"; print OUTDEFS "PROTOGENI_LOCALUSER=1\n";
} }
if (! ($emulabconfig{"CONFIG_TARGETSYS"} eq "GENIRACK" || # Stand alone
$emulabconfig{"CONFIG_FEDERATED"})) { if (!( $emulabconfig{"CONFIG_TARGETSYS"} eq "GENIRACK" ||
$emulabconfig{"CLOUDLAB_FEDERATED"})) {
print OUTDEFS "PROTOGENI_ISCLEARINGHOUSE=1\n"; 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"}) { if ($emulabconfig{"CONFIG_FIREWALL_BOSS"}) {
......
...@@ -724,6 +724,7 @@ VPUBADDR_BASE ...@@ -724,6 +724,7 @@ VPUBADDR_BASE
LINUX_FSNODE LINUX_FSNODE
PORTAL_ISPRIMARY PORTAL_ISPRIMARY
PORTAL_ENABLE PORTAL_ENABLE
CLOUDLAB_FEDERATED
OPSVM_MOUNTPOINT OPSVM_MOUNTPOINT
OPSVM_ENABLE OPSVM_ENABLE
NEEDMCQUERIER NEEDMCQUERIER
...@@ -5168,6 +5169,7 @@ OURTIMEZONE="America/Denver" ...@@ -5168,6 +5169,7 @@ OURTIMEZONE="America/Denver"
NODECONSOLE="sio" NODECONSOLE="sio"
MFSVERSION="" MFSVERSION=""
PORTAL_ENABLE=0 PORTAL_ENABLE=0
CLOUDLAB_FEDERATED=0
PORTAL_ISPRIMARY=0 PORTAL_ISPRIMARY=0
LINUX_FSNODE=0 LINUX_FSNODE=0
DHCPD_EXTRAIFS="" DHCPD_EXTRAIFS=""
......
...@@ -282,6 +282,7 @@ AC_SUBST(OPSVM_ENABLE) ...@@ -282,6 +282,7 @@ AC_SUBST(OPSVM_ENABLE)
AC_SUBST(OPSVM_MOUNTPOINT) AC_SUBST(OPSVM_MOUNTPOINT)
AC_SUBST(PORTAL_ENABLE) AC_SUBST(PORTAL_ENABLE)
AC_SUBST(PORTAL_ISPRIMARY) AC_SUBST(PORTAL_ISPRIMARY)
AC_SUBST(CLOUDLAB_FEDERATED)
AC_SUBST(LINUX_FSNODE) AC_SUBST(LINUX_FSNODE)
AC_SUBST(VPUBADDR_BASE) AC_SUBST(VPUBADDR_BASE)
AC_SUBST(VPUBADDR_BITLEN) AC_SUBST(VPUBADDR_BITLEN)
...@@ -459,6 +460,7 @@ NODECONSOLE="sio" ...@@ -459,6 +460,7 @@ NODECONSOLE="sio"
MFSVERSION="" MFSVERSION=""
PORTAL_ENABLE=0 PORTAL_ENABLE=0
PORTAL_ISPRIMARY=0 PORTAL_ISPRIMARY=0
CLOUDLAB_FEDERATED=0
LINUX_FSNODE=0 LINUX_FSNODE=0
DHCPD_EXTRAIFS="" DHCPD_EXTRAIFS=""
VPUBADDR_BASE="none" VPUBADDR_BASE="none"
......
...@@ -76,6 +76,7 @@ my $SUDO = "/usr/local/bin/sudo"; ...@@ -76,6 +76,7 @@ my $SUDO = "/usr/local/bin/sudo";
my $SSH = "/usr/bin/ssh"; my $SSH = "/usr/bin/ssh";
my $WAP = "$TB/sbin/withadminprivs"; my $WAP = "$TB/sbin/withadminprivs";
my $API_VERSION = 1.0; my $API_VERSION = 1.0;
my $CLOUDLAB_FEDERATED = @CLOUDLAB_FEDERATED@;
# #
# Check permission. At the moment, only the Mothership can issue requests # Check permission. At the moment, only the Mothership can issue requests
...@@ -118,7 +119,8 @@ sub CheckPermission($) ...@@ -118,7 +119,8 @@ sub CheckPermission($)
$OURDOMAIN eq "wisc.cloudlab.us" || $OURDOMAIN eq "wisc.cloudlab.us" ||
$OURDOMAIN eq "clemson.cloudlab.us" || $OURDOMAIN eq "clemson.cloudlab.us" ||
$OURDOMAIN eq "utahddc.geniracks.net" || $OURDOMAIN eq "utahddc.geniracks.net" ||
$OURDOMAIN eq "lab.onelab.eu")); $OURDOMAIN eq "lab.onelab.eu" ||
$CLOUDLAB_FEDERATED));
return 0; return 0;
} }
......
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