Changeset 1952 in ProjectBuilder

Timestamp:

Mar 5, 2015, 3:37:57 AM (9 years ago)

Author:

Bruno Cornec

Message:

• Adds a pb_ssh_setup function used for both VM and RM to setup the ssh environment with the right keyfile
• Move that ssh setup at the right place in launchv instead of setupv (was done too early now that VM launch has been re-adapted)

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb/bin/pb (modified) (11 diffs)

devel/pb-modules/etc/pb.conf

@@ -459 +459 @@
 #rbsmirrorsrv debian = http://ftp.us.debian.org/debian/
 #rbsmirrorsrv ubuntu = http://us.releases.ubuntu.com/releases/
+# For VE use this
+#rbsmirrorsrv ubuntu = http://archive.ubuntu.com/ubuntu
 #
 

devel/pb/bin/pb

@@ -2870 +2870 @@
         next;
     }
+
     
     $pm->finish if (defined $pbparallel);
@@ -3047 +3048 @@
     }
     pb_log(2,"DEBUG: pb_launchv returns ($vexist,$vpid)\n");
+
+    # After the VM is launched, then setup the SSH access
+    pb_ssh_setup($vtype,$nport);
     
-    # Skip that VM/RM if something went wrong
+    # Skip that VM if something went wrong
     return($vexist,$vpid) if (($vpid == 0) && ($vexist == 0));
     
@@ -3064 +3068 @@
 } else {
     # Get RM context
-    my ($ptr,$rmpath) = pb_conf_get("rmtype","rmpath");
+    my ($ptr,$rmpath,$rmport) = pb_conf_get("rmtype","rmpath","rmport");
 
     # Nothing more to do for RM. No real launch
@@ -3071 +3075 @@
     $vexist = 0;
     $vpid = 0;
+    
+    # After the RM is launched, then setup the SSH access
+    my $nport = pb_get_port($rmport,$pbos,$vtype);
+    pb_ssh_setup($vtype,$nport);
 }
 
@@ -3491 +3499 @@
     # Do not use the one passed potentially with -a
     my ($pbac) = pb_conf_get($vtype."login");
-    my ($key,$zero0,$zero1,$zero2);
+    my $key = "";
 
     # Prepare the script to be executed on the VM/VE/RM
@@ -3530 +3538 @@
 EOF
 
-    my $keyfile;
-    my $nport;
-    my $vmhost;
-
-    # Prepare the key to be used and transfered remotely
-    $keyfile = pb_ssh_get(1);
-        
-    if ($vtype =~ /(v|r)m/) {
-        my ($vmport);
-        ($vmhost,$vmport) = pb_conf_get($vtype."host",$vtype."port");
-        $nport = pb_get_port($vmport,$pbos,$vtype);
-    
-        # Store the pub key part in a variable
-        open(FILE,"$keyfile.pub") || die "Unable to open $keyfile.pub";
-        ($zero0,$zero1,$zero2) = split(/ /,<FILE>);
-        close(FILE);
-
-        $key = "\Q$zero1";
-
-        # We call true to avoid problems if SELinux is not activated, but chcon is present and returns in that case 1
-        pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; if [ -x /usr/bin/chcon ]; then /usr/bin/chcon -Rt home_ssh_t .ssh 2> /dev/null; /bin/true; fi\"","Copying local keys to $vtype. This may require the root password");
-        # once this is done, we can do what we need on the VM/RM remotely
-    } elsif ($vtype eq "ve") {
+    if ($vtype eq "ve") {
         $vetype = pb_ve_get_type($vetype);
         if ($vetype ne "docker") {
@@ -3565 +3551 @@
 EOF
         print SCRIPT "pb_system('rm -f /dev/null; mknod /dev/null c 1 3; chmod 777 /dev/null');\n" unless (($pbos->{'name'} =~ /^redhat/) && ($pbos->{'version'} =~ /^6/));
+    } elsif ($vtype =~ /(v|r)m/) {
+        my $keyfile;
+        my ($zero0,$zero1,$zero2);
+    
+        # Prepare the key to be used and transfered remotely
+        $keyfile = pb_ssh_get(1);
+    
+        # Store the pub key part in a variable
+        open(FILE,"$keyfile.pub") || die "Unable to open $keyfile.pub";
+        ($zero0,$zero1,$zero2) = split(/ /,<FILE>);
+        close(FILE);
+    
+        $key = "\Q$zero1";
     } else {
         die "Unknown virtual type $vtype";
@@ -3728 +3727 @@
     print SCRIPT << "EOF";
 # Some distro force requiretty at compile time, so disable here
-print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}} !requiretty\n";
-print PBOUT "Defaults:root !requiretty\n";
+print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}} !requiretty\\n";
+print PBOUT "Defaults:root !requiretty\\n";
 EOF
     # RH 6.2 sudo doesn't support env_keep
@@ -3735 +3734 @@
         print SCRIPT << "EOF";
 # Keep proxy configuration while using sudo
-print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
-print PBOUT "Defaults:root    env_keep += \\\"http_proxy ftp_proxy\\\"\n";
+print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\\n";
+print PBOUT "Defaults:root    env_keep += \\\"http_proxy ftp_proxy\\\"\\n";
 EOF
     }
@@ -3930 +3929 @@
 pb_log(2,"DEBUG: before parallel launch, pbscript hash is:".Dumper(%pbscript)."\n");
 pb_parallel_launchv(\%pbscript,$vtype,uc($vtype)."Script".$sbx,$pbstep,$pbforce);
+
 return;
 }
@@ -4891 +4891 @@
 }
 
+sub pb_ssh_setup {
+    
+my $vtype = shift;
+my $nport = shift;
+
+my $keyfile;
+my $vmhost;
+
+($vmhost) = pb_conf_get($vtype."host");
+# Prepare the key to be used and transfered remotely
+$keyfile = pb_ssh_get(1);
+
+# We call true to avoid problems if SELinux is not activated, but chcon is present and returns in that case 1
+pb_system("cat $keyfile.pub | ssh -q -o UserKnownHostsFile=/dev/null -p $nport -i $keyfile root\@$vmhost->{$ENV{'PBPROJ'}} \"mkdir -p .ssh ; chmod 700 .ssh ; cat >> .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; if [ -x /usr/bin/chcon ]; then /usr/bin/chcon -Rt home_ssh_t .ssh 2> /dev/null; /bin/true; fi\"","Copying local keys to $vtype. This may require the root password");
+# once this is done, we can do what we need on the VM/RM remotely
+return;
+}
 
 1;