Author: fapeeler
Date: Wed Jun 22 20:22:14 2011
New Revision: 1138615

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

continued work
can add users to the linux os

Modified:
    incubator/vcl/trunk/managementnode/bin/S99vcld.linux
    incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
    incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm
    incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm

Modified: incubator/vcl/trunk/managementnode/bin/S99vcld.linux
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/bin/S99vcld.linux?rev=1138615&r1=1138614&r2=1138615&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/bin/S99vcld.linux (original)
+++ incubator/vcl/trunk/managementnode/bin/S99vcld.linux Wed Jun 22 20:22:14 
2011
@@ -22,14 +22,14 @@
 # description: VCL management node daemon
 
 # DAEMON: Name of the daemon executable
-DAEMON=vcld
+DAEMON=vcldfap
 
 # DAEMON_PATH: Path to the daemon, no trailing '/'
-DAEMON_PATH=/usr/local/vcl/bin
+DAEMON_PATH=/usr/local/vcldev/fap/managementnode/bin
 
 # DAEMON_OPTIONS: options for the daemon, these can be overridden by
 # setting DAEMON_OPTIONS in /etc/sysconfig/$DAEMON
-DAEMON_OPTIONS='-v -conf=/etc/vcl/vcld.conf'
+DAEMON_OPTIONS='-v 
-conf=/usr/local/vcldev/fap/managementnode/etc/vcl/vcld.conf'
 
 
 # You shouldn't need to edit anything below here

Modified: incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf?rev=1138615&r1=1138614&r2=1138615&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf (original)
+++ incubator/vcl/trunk/managementnode/etc/vcl/vcld.conf Wed Jun 22 20:22:14 
2011
@@ -34,31 +34,31 @@
 
 # FQDN: DNS name of the management node
 # Example: mgtnode1.hpc.someschool.edu
-FQDN=
+FQDN=vcl00mn.hpc.ncsu.edu
 
 # processname: name to call VCL daemon process
 # Default: vcld
-processname=vcld
+processname=vcldfap
 
 # log: log file location
 # Default: /var/log/vcld.log
 # If left undefined it will be named according to the above processname
 # i.e. /var/log/$PROCESSNAME.log
-log=/var/log/vcld.log
+log=/usr/local/vcldev/fap/managementnode/vcldfap.log
 
 # pidfile: process id file location 
-# Default: /var/run/vcld.pid
+# Default: /var/run/vcldfap.pid
 # If left undefined it will be named according to the above processname
 # i.e. /var/run/$PROCESSNAME.pid
-pidfile=/var/run/vcld.pid
+pidfile=/var/run/vcldfap.pid
 
 # Database connection information
 
 # database: name of MySQL database (required)
-database=vcl
+database=vcldev
 
 # server: IP address or FQDN of the database server (required)
-server=
+server=152.7.98.108
 
 # LockerWrtUser: MySQL user account name with write privileges (required)
 LockerWrtUser=vcl-wrt
@@ -66,7 +66,7 @@ LockerWrtUser=vcl-wrt
 # wrtPass: MySQL password of the above LockerWrtUser (required)
 # Any length is supported by MySQL
 # Must be a string of characters: A-Z a-z 0-9
-wrtPass=
+wrtPass=iM5jNOPWyStu6
 
 # xml-rpc username password and url information
 # Required for block reservation processing
@@ -76,9 +76,9 @@ wrtPass=
 #   for example, if you install the VCL web code at 
https://vcl.example.org/vcl/
 #   set xmlrpc_url to https://vcl.example.org/vcl/index.php?mode=xmlrpccall
 
-xmlrpc_username=vclsystem
-xmlrpc_pass=insecureDefault
-xmlrpc_url=
+xmlrpc_username=admin@local
+xmlrpc_pass=vclc1-5devserver
+xmlrpc_url=https://vcldev.csc.ncsu.edu/vcl/index.php?mode=xmlrpccall
 
 ######### END REQUIRED Configuration settings ##############
 

Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1138615&r1=1138614&r2=1138615&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS.pm Wed Jun 22 20:22:14 
2011
@@ -1744,13 +1744,13 @@ sub manage_server_access {
                                $user_hash{$userid}{"passwd"} = 0;
                        }
                        
-                       if 
(!(update_reservation_accounts($reservation_id,$user_hash{$userid}{vcl_user_id},$user_hash{$userid}{passwd})))
 {
-                               notify($ERRORS{'WARNING'}, 0, "Failed to insert 
$reservation_id,$user_hash{$userid}{vcl_user_id},$user_hash{$userid}{passwd} 
into reservationsaccounts table");
+                       if 
(update_reservation_accounts($reservation_id,$user_hash{$userid}{vcl_user_id},$user_hash{$userid}{passwd}))
 {
+                               notify($ERRORS{'OK'}, 0, "Inserted 
$reservation_id,$user_hash{$userid}{vcl_user_id},$user_hash{$userid}{passwd} 
into reservationsaccounts table");
                        
                        }
                        
                        # Create user on the OS
-                       
if($self->OS->create_user($user_hash{$userid}{username},$user_hash{passwd},$user_hash{$userid}{uid},$user_hash{$userid}{rootaccess},$standalone))
 {
+                       
if($self->create_user($user_hash{$userid}{username},$user_hash{passwd},$userid,$user_hash{$userid}{rootaccess},$standalone))
 {
                                notify($ERRORS{'OK'}, 0, "Successfully created 
user $user_hash{$userid}{username} on $computer_node_name");
                        }
                        else {

Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm
URL: 
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm?rev=1138615&r1=1138614&r2=1138615&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Linux.pm Wed Jun 22 
20:22:14 2011
@@ -2722,15 +2722,15 @@ sub create_user {
 
         my $management_node_keys = $self->data->get_management_node_keys();
         my $computer_node_name   = $self->data->get_computer_node_name();
-       my $user_standalone      = $self->data->get_user_standalone();
         my $imagemeta_rootaccess = $self->data->get_imagemeta_rootaccess();
 
         # Attempt to get the username from the arguments
         # If no argument was supplied, use the user specified in the 
DataStructure
         my $user_name = shift;
         my $password = shift;
-       my $adminoverride = shift;
        my $user_uid = shift;
+       my $adminoverride = shift;
+       my $user_standalone = shift;
        
         if (!$user_name) {
                 $user_name = $self->data->get_user_login_id();
@@ -2744,6 +2744,10 @@ sub create_user {
        if (!$user_uid) {
                $user_uid = $self->data->get_user_uid();        
        }
+       
+       if (!$user_standalone) {
+               $user_standalone      = $self->data->get_user_standalone();
+       }
 
        #adminoverride, if 0 use value from database for $imagemeta_rootaccess
        # if 1 or 2 override database


Reply via email to