svn commit: r940910 - in /incubator/vcl/trunk/managementnode: etc/vcl/vcld.conf lib/VCL/utils.pm

[fa...@apache.org]

Author: fapeeler
Date: Tue May  4 15:34:39 2010
New Revision: 940910

URL: http://svn.apache.org/viewvc?rev=940910&view=rev
Log:
VCL-224

Removed references to IMAGELIB* values. This is stored and retrieved from the database management node table and no longer needs to be in vcld.conf

Modified:
    incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
    incubator/vcl/trunk/managementnode/lib/VCL/utils.pm

Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=940910&r1=940909&r2=940910&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original)
+++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Tue May  4 15:34:39 2010
@@ -229,28 +229,6 @@ RHFC5_TMPLREPOSITORY=XCATROOT/install/rh
 # linux image - includes image templates for rh4,rhfc5,etc
 LINUXIMAGE_TMPLREPOSITORY=XCATROOT/install/linux_image/x86
 
-#image libraries can exist on other management nodes and hold images that we might need
-#imagelibenable, yes,no enabled,disabled   
-imagelibenable=no
-
-#imageservers = comma seperated list of IP addresses of other management nodes or image libraries
-imageservers=
-
-#imagelibuser, user allowed to login via ssh
-# adduser account: useradd -d /home/vclstaff -m vclstaff
-imagelibuser=vclstaff
-
-#imagelibkey, identity key for imagelibuser
-# to setup identity key:
-# as root su - vclstaff
-# generate key: ssh-keygen -t dsa
-# press enter when prompted for passphrase 
-# append pub key to authorized_keys: cat id_dsa.pub > authorized_keys
-#exit vclstaff
-#copy /home/vclstaff/.ssh id_dsa /etc/vcl/imagelib.key
-#make sure permissions are 600 chmod 600 /etc/vcl/imagelib.key
-imagelibidkey=/etc/vcl/imagelib.key
-
 # - VMWARE vmdk image files
 # - this can be storage on the management node
 VMWARE_IMAGEREPOSITORY=/install/vmware_images

Modified: incubator/vcl/trunk/managementnode/lib/VCL/utils.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/utils.pm?rev=940910&r1=940909&r2=940910&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/utils.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/utils.pm Tue May  4 15:34:39 2010
@@ -245,10 +245,6 @@ our @EXPORT = qw(
   %ERRORS
   %OPTIONS
 
-  $IMAGELIBENABLE
-  $IMAGELIBUSER
-  $IMAGELIBKEY
-  $IMAGESERVERS
 );
 
 #our %ERRORS=('DEPENDENT'=>4,'UNKNOWN'=>3,'OK'=>0,'WARNING'=>1,'CRITICAL'=>2,'MAILMASTERS'=>5);
@@ -266,8 +262,6 @@ INIT {
 	our ($LINUX_IMAGE,     $THROTTLE);
 	our ($CORE_IMAGEREPOSITORY, $WIN_IMAGEREPOSITORY, $LINUX_IMAGEREPOSITORY);
 	our ($IDENTITY_linux_lab, $IDENTITY_solaris_lab, $IDENTITY_wxp, $IDENTITY_newwxp, $IDENTITY_bladerhel);
-	our ($IMAGELIBENABLE) = 0;
-	our ($IMAGESERVERS, $IMAGELIBUSER, $IMAGELIBKEY);
 	our ($VMWARETYPE, $VMWARE_DISK,$VMWARE_MAC_ETH0_GENERATED, $VMWARE_MAC_ETH1_GENERATED);
 	our ($WINDOWS_ROOT_PASSWORD);
    our ($XMLRPC_USER, $XMLRPC_PASS, $XMLRPC_URL);
@@ -499,23 +493,6 @@ INIT {
 				$IDENTITY_linux_lab = $1;
 			}
 
-			#image library share - sync images across multiple management nodes
-			# $IMAGELIBENABLE,$IMAGESERVERS,$IMAGELIBUSER,$IMAGELIBKEY
-			if ($l =~ /^IMAGELIBENABLE=(yes)/) {
-				$IMAGELIBENABLE = 1;
-			}
-			elsif ($l =~ /^IMAGELIBENABLE=(no)/) {
-				$IMAGELIBENABLE = 0;
-			}
-			if ($l =~ /^imageservers=(.*)/) {
-				$IMAGESERVERS = $1;
-			}
-			if ($l =~ /^imagelibuser=(.*)/) {
-				$IMAGELIBUSER = $1;
-			}
-			if ($l =~ /^imagelibidkey=(.*)/) {
-				$IMAGELIBKEY = $1;
-			}
 			#vmware settings
 			# localdisk
 			if ($l =~ /^VMWARE_DISK=(localdisk|networkdisk)/) {
@@ -647,7 +624,6 @@ our ($IPCONFIGURATION, $DNSserver, $GATE
 our ($LINUX_IMAGE,     $THROTTLE);
 our ($FQDN);
 our ($IDENTITY_linux_lab, $IDENTITY_solaris_lab, $IDENTITY_wxp, $IDENTITY_bladerhel);
-our ($IMAGELIBENABLE,     $IMAGESERVERS,         $IMAGELIBUSER, $IMAGELIBKEY);
 our ($VMWARE_DISK);
 our $IDENTITY_newwxp    = "$FindBin::Bin/../lib/VCL/newwinxp_blade.key";
 our $XCATROOT           = "/opt/xcat";