disk_image change; allow name to be a url, url is deprecated.

36cbaa20 · Leigh B Stoller · 43a8e0fb · 36cbaa20
Commit 36cbaa20 authored Jul 02, 2013 by Leigh B Stoller
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

protogeni/lib/GeniCM.pm.in protogeni/lib/GeniCM.pm.in +5 -0

No files found.
--- a/protogeni/lib/GeniCM.pm.in
+++ b/protogeni/lib/GeniCM.pm.in
@@ -967,6 +967,11 @@ sub GetTicketAuxAux($$$$$$$$$)
 	    my $dname = GeniXML::GetText("name", $diskref);
 	    my $url   = GeniXML::GetText("url", $diskref);

+	    # url is deprecated; name can be anything.
+	    if (defined($dname) && $dname =~ /^http/) {
+		$url = $dname;
+	    }
+
 	    if (defined($url)) {
 		if (! TBcheck_dbslot($url, "virt_nodes", "osname",
 				 TBDB_CHECKDBSLOT_WARN|TBDB_CHECKDBSLOT_ERROR)){