Changeset 988 in ProjectBuilder

Timestamp:

Feb 23, 2010, 8:22:02 AM (15 years ago)

Author:

Bruno Cornec

Message:

r3704@localhost: bruno | 2010-02-22 00:35:17 +0100

• Updated pb.conf configuration (mostly done)
• vetmout removed

Location:

devel

Files:

• pb-doc/pb.conf.pod (modified) (4 diffs)
• pb/bin/pb (modified) (1 diff)
• rpmbootstrap/etc/.pbrc (modified) (1 diff)

devel/pb-doc/pb.conf.pod

@@ -398 +398 @@
 
 =item B<vesnap>
-=item B<vetmout>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: true|false. True means that the snapshot of the VE should be used before call to the VE. This snapshot consists of a compressed tar pf the VE. Which means that you will always start from a known state, resulting of a former snapshot operation on the VE. Also speeds up a lot the VM launch operation.
+Conffile: ve
+Example: vesnap default = true
+
 =item B<vetype>
 
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: chroot|schroot. There are two different ways of launching a chroot activity in pb. For the moment only chroot has been tested.
+Conffile: ve
+Example: vertype default = chroot
+
 =item B<vmhost>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: hostname to connect to in order to reach the VM through ssh. Generally redirected from a port on localhost.
+Conffile: vm
+Example: vmhost default = localhost
+
 =item B<vmlist>
 
@@ -419 +438 @@
 
 =item B<vmmonport>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: TCP port that is used to dialog with the monitor of the VM, to pass orders such as snapshot. Not really operational yet.
+Conffile: vm
+Example: vmmonport default = 4444
+
 =item B<vmntp>
 
@@ -436 +462 @@
 
 =item B<vmopt>
+
+Nature: Optional
+Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). NB: a default value is highly interesting here.
+Value: list of options to pass to the VM manager command launcher for that distribution. Another way to pass options to the VM manager command launcher is by using the PBVMOPT environment variable, which comes in addition to his option.
+Conffile: vm
+Example: vmopt default = -m 384 -daemonize,vmopt mandriva-2009.0-i386 = -m 256 -daemonize -no-kvm
+
 =item B<vmpath>
 
@@ -445 +478 @@
 
 =item B<vmport>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: port number to use to communicate with the VM using the SSH protocol. This localport is redirected to the port 22 of the VM.
+Conffile: vm
+Example: vmport pb = 2222,vmport mondorescue = 2223
+
 =item B<vmsize>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: Size of the VM to create when using the newvm command of pb.
+Conffile: vm
+Example: vmsize default = 7G
+
 =item B<vmsnap>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: true|false. True means that the snapshot of the VM called pb should be used. Which means that you will always start from a known state, resulting of a former snapshot operation on the VM. Also speeds up a lot the VM launch operation.
+Conffile: vm
+Example: vmsnap default = true
+
 =item B<vmtmout>
+
+Nature: Optional
+Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). NB: a default value is highly interesting here.
+Value: Time in seconds to way beofre interacting with the VM. This should corresponds to the time the VM takes to boot.
+Conffile: vm
+Example: vmtmout default = 180,vmtmout mandriva-2009.0-x86_64 = 500
+
 =item B<vmtype>
+
+Nature: Mandatory
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: qemu|kvm. For the moment, only QEMU or KVM are supported as virtualization technologies.
+Conffile: vm
+Example: vmrtype default = kvm
+
 =item B<webdir>
+
+Nature: Optional
+Key: project (as defined in the -p option or PBPROJ environment variable)
+Value: Target directory containing the web content in the project that should be delivered when using the web2ssh command of pb.
+Conffile: project
+Example: webdir mondorescue = website
 
 =item B<pb URL>
 =item B<pb directory desc>
+=item B<pb environment variables>

devel/pb/bin/pb

@@ -1739 +1739 @@
 
         # Get VE context
-        my ($ptr,$vetmout,$vepath,$rbsconf) = pb_conf_get("vetype","vetmout","vepath","rbsconf");
+        my ($ptr,$vepath,$rbsconf) = pb_conf_get("vetype","vepath","rbsconf");
         my $vetype = $ptr->{$ENV{'PBPROJ'}};
 

devel/rpmbootstrap/etc/.pbrc

@@ -30 +30 @@
 velogin default = pb
 
-# Timeout to wait when VE is launched/stopped
-vetmout default = 2
-
 # per VEs needed paramaters
 veopt default =