From 2f3ab2c6c2c4f3d7354d64e28d73ba5168abf7d5 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 12 Sep 2008 13:54:14 +0000 Subject: [PATCH] -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 --- xCAT-server/lib/xcat/plugins/anaconda.pm | 17 ----------------- xCAT-server/lib/xcat/plugins/sles.pm | 18 ------------------ 2 files changed, 35 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index e057bb702..d5e855f69 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -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->( diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index cb41aff1b..29ee72077 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -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->(