Changeset 33415 for branches/meh_branches/ppstack_test/Nebulous-Server/bin/neb-host

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• Nebulous-Server/bin/neb-host (modified) (3 diffs)

branches/meh_branches/ppstack_test/Nebulous-Server/bin/neb-host

@@ -18 +18 @@
 my ($host, $state, $note,
     $db, $dbhost, $dbpass, $dbuser,
-    $allocate, $available, $debug);
+    $allocate, $available, $debug,$volume);
 
 # $db     = $ENV{'NEB_DB'} unless $db;
@@ -56 +56 @@
     'dbuser=s'       => \$dbuser,
     'dbpass=s'       => \$dbpass,
-
+    'volume'         => \$volume,
     
     ) || pod2usage( 2 );
@@ -98 +98 @@
     
     my %constraint;
-    $constraint{'v.host'} = $host;
+    if (defined($volume)) {
+        $constraint{'v.name'} = $host;
+    }
+    else {
+        $constraint{'v.host'} = $host;
+    }
     my %set;
     $set{'v.allocate'} = $allocate if defined $allocate;