Commit c40b80a3 authored by Leigh Stoller's avatar Leigh Stoller

Merge branch 'disable_exports_setup_upd' into 'master'

Update to DISABLE_EXPORTS_SETUP

See merge request !48
parents 2d941e27 ab2a5e33
......@@ -5182,6 +5182,7 @@ UNIFIED_BOSS_AND_OPS=0
DISABLE_NAMED_INSTALL=0
DISABLE_DHCPD_INSTALL=0
DISABLE_NAMED_SETUP=0
DISABLE_EXPORTS_SETUP=0
FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT=3564
FRISEBEENUMPORTS=0
......
......@@ -423,6 +423,7 @@ UNIFIED_BOSS_AND_OPS=0
DISABLE_NAMED_INSTALL=0
DISABLE_DHCPD_INSTALL=0
DISABLE_NAMED_SETUP=0
DISABLE_EXPORTS_SETUP=0
FRISEBEEMCASTADDR="234.5.6"
FRISEBEEMCASTPORT=3564
FRISEBEENUMPORTS=0
......
......@@ -233,6 +233,7 @@ $CVSSUPPORT = @CVSSUPPORT@;
$BUGDBSUPPORT = @BUGDBSUPPORT@;
$WIKISUPPORT = @WIKISUPPORT@;
$NOSHAREDFS = @NOSHAREDFS@;
$DISABLE_EXPORTS_SETUP = @DISABLE_EXPORTS_SETUP@;
# Are we a VM on boss?
$OPSVM_ENABLE = @OPSVM_ENABLE@;
# mrouted no longer needed; replaced by IGMP querier in mfrisbeed
......
......@@ -123,6 +123,9 @@ sub Install($$$)
}
};
Phase "keycopy2", "Copy root ssh keys to fs", sub {
if ($DISABLE_EXPORTS_SETUP) {
PhaseSkip("FS node is not managed by boss");
}
if ($USERNODE eq $FSNODE) {
PhaseSkip("FS node is ops node");
}
......
......@@ -95,6 +95,9 @@ sub Install($$$)
" chown root:wheel ${ETC_EMULAB_DIR}/${EMULAB_PEM}' ");
};
Phase "sslfscopy", "Copying SSL certificates to fs", sub {
if ($DISABLE_EXPORTS_SETUP) {
PhaseSkip("FS node is not managed by boss");
}
if ($USERNODE eq $FSNODE) {
PhaseSkip("FS node is ops node");
}
......
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