From 1c24f7f1e1dcb02a12963731d1cf348c40aa400a Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 21 Mar 2008 16:35:32 +0000 Subject: [PATCH] support for multiple slice reference images * vserver-reference rpm names have changed and become vserver-@pldistro@-@fcdistro@-@arch@ vserver-systemslices-@pldistro@-@fcdistro@-@arch@ * this contains the images located as /vservers/.vref/@pldistro@-@fcdistro@-@arch@ and /vservers/.vstub/@pldistro@-@fcdistro@-@arch@/planetflow respectively * a stamp gets created on the nodes as /etc/planetlab/defaultvref that contains the name for the default slicefamily to use * nodemanager tries to be smart when chosing the right argument to pass to vuseradd for this purpose, the argument in 'vref' is taken as a dash-separated list of 'wishes' so e.g. is defaultvref is planetlab-f8-x86_64, then we should find for the image name: vref=i386 -> vuseradd -t planetlab-f8-i386 vref=centos5 -> vuseradd -t planetlab-centos5-x86_64 vref=planetflow -> vuseradd -t planetflow vref=centos5-onelab -> vuseradd -t onelab-centos5-x86_64 for legacy reasons, if the stamp is not found, 'default' is taken instead === status * this is only partly tested * a given node can install several variants of vserver-* this would require a manual upload of the rpms into the right install-rpms and manual changes in yumgroups. * next improvement would be to have the system (planetflow) slices have a smarter naming scheme as well this way a 'planetflow' vref would rather be rewritten as planetflow-f8-x86_64 for the time being it is not supported to install several variants of vserver-systemslices on the node - although it should be harmless --- config.planetlab/bootstrapfs.pkgs | 4 ++-- config.planetlab/devel.pkgs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config.planetlab/bootstrapfs.pkgs b/config.planetlab/bootstrapfs.pkgs index 4f05ccce..73fc550a 100644 --- a/config.planetlab/bootstrapfs.pkgs +++ b/config.planetlab/bootstrapfs.pkgs @@ -114,8 +114,8 @@ package: NodeUpdate package: codemux package: pl_sshd package: ipod -package: vserver-reference -package: vserver-system-packages +package: vserver-@pldistro@-@fcdistro@-@arch@ +package: vserver-systemslices-@pldistro@-@fcdistro@-@arch@ package: pl_mom package: netflow-utils package: proper diff --git a/config.planetlab/devel.pkgs b/config.planetlab/devel.pkgs index 916196a1..9d2b7ce3 100644 --- a/config.planetlab/devel.pkgs +++ b/config.planetlab/devel.pkgs @@ -55,7 +55,6 @@ package: gcc-c++ package: libpcap libpcap-devel # iptables package: linuxdoc-tools -# vserver-reference package: sudo package: yum createrepo # mysql -- 2.47.0