Commit 5878a667 authored by Leigh Stoller's avatar Leigh Stoller

Do not contact outer emulab when adding control nodes.

parent 109d5e8e
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2003-2012 University of Utah and the Flux Group. # Copyright (c) 2003-2013 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -336,7 +336,7 @@ NODE: foreach my $node_id (@node_ids) { ...@@ -336,7 +336,7 @@ NODE: foreach my $node_id (@node_ids) {
# #
my $outer_control_ip; my $outer_control_ip;
if ($ELABINELAB) { if ($ELABINELAB && $role ne "ctrlnode") {
libxmlrpc::Config({"server" => $RPCSERVER, libxmlrpc::Config({"server" => $RPCSERVER,
"verbose" => 0, "verbose" => 0,
"cert" => $RPCCERT, "cert" => $RPCCERT,
...@@ -354,7 +354,7 @@ NODE: foreach my $node_id (@node_ids) { ...@@ -354,7 +354,7 @@ NODE: foreach my $node_id (@node_ids) {
{"mac" => $macstr}); {"mac" => $macstr});
if (!defined($rval)) { if (!defined($rval)) {
print "XMPRPC server did not return control iface info!\n"; print "XMLRPC server did not return control iface info!\n";
next NODE; next NODE;
} }
else { else {
...@@ -571,7 +571,7 @@ if ($exports_rv) { ...@@ -571,7 +571,7 @@ if ($exports_rv) {
# #
# Start rebooting nodes # Start rebooting nodes
# #
if (!$noreboot) { if (!$noreboot && @reboot_IPs) {
print "Rebooting nodes...\n"; print "Rebooting nodes...\n";
foreach my $IP (@reboot_IPs) { foreach my $IP (@reboot_IPs) {
print "Rebooting $IP\n"; print "Rebooting $IP\n";
......
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