X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=gnt-instance-mac-ip.pl;h=9fc0bf3cc72bd0bde24c1950663e106cf6fe9c67;hb=7d4ea81a4f77b7cee4ff91cf6d672db7e7078d81;hp=0bb76b7557fe9c37fc2822a1c4af9407c3780bdb;hpb=04f59295e0a46a8317fac7276cd701ea67cbe7ac;p=gnt-info

diff --git a/gnt-instance-mac-ip.pl b/gnt-instance-mac-ip.pl
index 0bb76b7..9fc0bf3 100755
--- a/gnt-instance-mac-ip.pl
+++ b/gnt-instance-mac-ip.pl
@@ -13,10 +13,10 @@ while(<$in>) {
 	$mac2ip_vlan->{$mac} = [ $ip, $vlan ];
 }
 
-open(my $gnt, '-|', qq{gnt-instance list --no-header --separator=' ' -o name,nic.macs,nic.bridges});
+open(my $gnt, '-|', qq{gnt-instance list --no-header --separator=' ' -o name,nic.macs,nic.bridges,tags});
 while(<$gnt>) {
 	chomp;
-	my ( $name,$macs,$bridges ) = split(/\s/,$_);
+	my ( $name,$macs,$bridges,$tags ) = split(/\s/,$_,4);
 	my @macs = split(/,/,$macs);
 	my @br  = split(/,/,$bridges);
 	for my $i ( 0 .. $#macs ) {
@@ -27,6 +27,8 @@ while(<$gnt>) {
 		} else {
 			print "? ?";
 		}
-		print "\n";
+		$tags =~ s/ganeti:watcher[^,]*,*//g;
+		$tags =~ s/ganetimgr://g;
+		print " $tags\n";
 	}
 }