Commit b9fdb5b8 authored by Kirk Webb's avatar Kirk Webb

Refactor to better match intended libvnode logic.

parent 300e70f8
......@@ -138,6 +138,9 @@ if ($UID != 0) {
# Tell the library what vnode we are messing with.
libsetup_setvnodeid($vnodeid);
# XXX XXX XXX: testing!
libtmcc::configtmcc("portnum",7778);
# Can set this after above line.
my $RUNNING_FILE = CONFDIR() . "/running";
......@@ -281,6 +284,7 @@ my %vnconfig = ( "vnodeid" => $vnodeid,
"ldconfig" => undef,
"tunconfig" => undef,
"attributes"=> undef,
"storageconfig" => undef,
);
sub VNCONFIG($) { return $vnconfig{'config'}->{$_[0]}; }
......@@ -334,6 +338,10 @@ fatal("getnodeattributes($vnodeid): $!")
if (getnodeattributes(\%attrs));
$vnconfig{"attributes"} = \%attrs;
fatal("getstorageconfig($vnodeid): $!")
if (getstorageconfig(\@tmp));
$vnconfig{"storageconfig"} = [ @tmp ];
if ($debug) {
print "VN Config:\n";
print Dumper(\%vnconfig);
......
......@@ -51,10 +51,6 @@ my $vnconfig = mkvnconfig($vnodeid);
if ($setup) {
libvnode_blockstore::vnodeCreate($vnodeid, undef, $vnconfig,
$vnconfig->{'private'});
libvnode_blockstore::vnodePreConfigExpNetwork($vnodeid, undef, $vnconfig,
$vnconfig->{'private'});
libvnode_blockstore::vnodeConfigResources($vnodeid, undef, $vnconfig,
$vnconfig->{'private'});
}
# Sleep for a bit...
......
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