mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 03:12:30 +00:00 
			
		
		
		
	-Revert Table write/retrieval at nodeset time
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2152 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
		| @@ -296,23 +296,6 @@ sub mknetboot | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|        # Has to be tested... | ||||
|        # | ||||
|        # Try to insert special idiom {xcatmaster} to bootparams table if the above | ||||
|        # value resolves to the same value as {xcatmaster}. | ||||
|        # This allows avoiding xcatmaster hostname where possible, thus allowing | ||||
|        # to keep database very clean and minimize needed changes in db | ||||
|        # when moving xcat to another node. | ||||
|        #-- test whether special construction '{xcatmater}' is supported in Table.pm | ||||
|        $sitetab->setAttribs( {'key' => 'testkey'}, {'value' => '{xcatmaster}'} ); | ||||
|        my $testvalue = $sitetab->getAttribs({key => "testkey"}, 'value'); | ||||
|        #-- now "testkey" will _NOT_ contain '{xcatmaster}' if special substitutions are supported | ||||
|        if ( $testvalue->{"value"} eq $imgsrv ) { #-- xCAT supports interpolation of '{xcatmaster}' | ||||
|          $imgsrv = '{xcatmaster}'; | ||||
|        } | ||||
|        $sitetab->delEntries( {'key' => 'testkey'} );   #-- clean up | ||||
|  | ||||
|         unless ($imgsrv) | ||||
|         { | ||||
|             $callback->( | ||||
|   | ||||
| @@ -167,24 +167,6 @@ sub mknetboot | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|        # Has to be tested... | ||||
|        # | ||||
|        # Try to insert special idiom {xcatmaster} to bootparams table if the above | ||||
|        # value resolves to the same value as {xcatmaster}. | ||||
|        # This allows avoiding xcatmaster hostname where possible, thus allowing | ||||
|        # to keep database very clean and minimize needed changes in db | ||||
|        # when moving xcat to another node. | ||||
|  | ||||
|        #-- test whether special construction '{xcatmater}' is supported in Table.pm | ||||
|        $sitetab->setAttribs( {'key' => 'testkey'}, {'value' => '{xcatmaster}'} ); | ||||
|        my $testvalue = $sitetab->getAttribs({key => "testkey"}, 'value'); | ||||
|        #-- now "testkey" will _NOT_ contain '{xcatmaster}' if special substitutions are supported | ||||
|        if ( $testvalue->{"value"} eq $imgsrv ) { #-- xCAT supports interpolation of '{xcatmaster}' | ||||
|          $imgsrv = '{xcatmaster}'; | ||||
|        } | ||||
|        $sitetab->delEntries( {'key' => 'testkey'} );   #-- clean up | ||||
|  | ||||
|         unless ($imgsrv) | ||||
|         { | ||||
|             $callback->( | ||||
|   | ||||
		Reference in New Issue
	
	Block a user