X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=5f51503a183c19cb04be937b2bcfa6e59e56cb30;hb=b4dcf590f6c1aaaf3f4d508dfa207ed5fed6851e;hp=199cacf422672c0a61dd9a9f41f96c6586640ab8;hpb=5436683ad7256354bea7010e16be88460258bf07;p=build.git diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh index 199cacf4..5f51503a 100755 --- a/lbuild-initvm.sh +++ b/lbuild-initvm.sh @@ -10,7 +10,7 @@ COMMAND=$(basename $0) DIRNAME=$(dirname $0) BUILD_DIR=$(pwd) -# pkgs parsing utilities +# pkgs parsing utilities + lbuild-bridge.sh export PATH=$(dirname $0):$PATH # old guests have e.g. mount in /bin but this is no longer part of @@ -22,6 +22,7 @@ export PATH=$PATH:/bin:/sbin DEFAULT_FCDISTRO=f20 DEFAULT_PLDISTRO=lxc DEFAULT_PERSONALITY=linux64 +DEFAULT_MEMORY=512 ########## # constant @@ -34,32 +35,7 @@ VIF_GUEST=eth0 FEDORA_PREINSTALLED="yum initscripts passwd rsyslog vim-minimal dhclient chkconfig rootfiles policycoreutils openssh-server openssh-clients" DEBIAN_PREINSTALLED="openssh-server openssh-client" -############################## -## stolen from tests/system/template-qemu/qemu-bridge-init -# use /proc/net/dev instead of a hard-wired list -function gather_interfaces () { - python < /dev/null @@ -87,92 +63,6 @@ print ".".join([ str(256-2**(8-i)) for i in result ]) EOF } -#################### bridge initialization -function create_bridge_if_needed() { - - # turn on verbosity - set -x - - # already created ? - we're done - ip addr show $PUBLIC_BRIDGE >& /dev/null && { - echo "Bridge already set up - skipping create_bridge_if_needed" - return 0 - } - - # find out the physical interface to bridge onto - if_lan=$(discover_interface) - - ip addr show $if_lan &>/dev/null || { - echo "Cannot use interface $if_lan - exiting" - exit 1 - } - - #################### bride initialization - check_yum_installed bridge-utils - - echo "========== $COMMAND: entering create_bridge - beg" - hostname - uname -a - ip addr show - ip route - echo "========== $COMMAND: entering create_bridge - end" - - # disable netfilter calls for bridge interface (they cause panick on 2.6.35 anyway) - # - # another option would be to accept the all forward packages for - # bridged interface like: -A FORWARD -m physdev --physdev-is-bridged -j ACCEPT - sysctl net.bridge.bridge-nf-call-iptables=0 - sysctl net.bridge.bridge-nf-call-ip6tables=0 - sysctl net.bridge.bridge-nf-call-arptables=0 - - - #Getting host IP/masklen - address=$(ip addr show $if_lan | grep -v inet6 | grep inet | head --lines=1 | awk '{print $2;}') - [ -z "$address" ] && { echo "ERROR: Could not determine IP address for $if_lan" ; exit 1 ; } - - broadcast=$(ip addr show $if_lan | grep -v inet6 | grep inet | head --lines=1 | awk '{print $4;}') - [ -z "$broadcast" ] && echo "WARNING: Could not determine broadcast address for $if_lan" - - gateway=$(ip route show | grep default | awk '{print $3;}') - [ -z "$gateway" ] && echo "WARNING: Could not determine gateway IP" - - - # creating the bridge - echo "Creating bridge PUBLIC_BRIDGE=$PUBLIC_BRIDGE" - brctl addbr $PUBLIC_BRIDGE - brctl addif $PUBLIC_BRIDGE $if_lan - echo "Activating promiscuous mode if_lan=$if_lan" - ip link set $if_lan up promisc on - sleep 2 - # rely on dhcp to re assign IP.. - echo "Starting dhclient on $PUBLIC_BRIDGE" - dhclient $PUBLIC_BRIDGE - sleep 1 - - #Reconfigure the routing table - echo "Configuring gateway=$gateway" - ip route add default via $gateway dev $PUBLIC_BRIDGE - ip route del default via $gateway dev $if_lan - # at this point we have an extra route like e.g. - ## ip route show - #default via 138.96.112.250 dev br0 - #138.96.112.0/21 dev em1 proto kernel scope link src 138.96.112.57 - #138.96.112.0/21 dev br0 proto kernel scope link src 138.96.112.57 - #192.168.122.0/24 dev virbr0 proto kernel scope link src 192.168.122.1 - route_dest=$(ip route show | grep -v default | grep "dev $PUBLIC_BRIDGE" | awk '{print $1;}') - ip route del $route_dest dev $if_lan - - echo "========== $COMMAND: exiting create_bridge - beg" - ip addr show - ip route show - echo "========== $COMMAND: exiting create_bridge - end" - - # for safety - sleep 3 - return 0 - -} - ############################## # return yum or debootstrap function package_method () { @@ -207,17 +97,6 @@ function almost_empty () { count=$(cd $dir; ls | wc -l); [ $count -le 1 ]; } -############################## -function check_yum_installed () { - package=$1; shift - rpm -q $package >& /dev/null || yum -y install $package -} - -function check_yumgroup_installed () { - group="$1"; shift - yum grouplist "$group" | grep -q Installed || { yum -y groupinstall "$group" ; } -} - ############################## function fedora_install() { set -x @@ -375,7 +254,7 @@ EOF guest_ifcfg=${lxc_root}/etc/sysconfig/network-scripts/ifcfg-$VIF_GUEST ( [ -n "$BUILD_MODE" ] && write_guest_ifcfg_build || write_guest_ifcfg_test ) > $guest_ifcfg - fedora_configure_yum $lxc $fcdistro $pldistro + [ -z "$IMAGE" ] && fedora_configure_yum $lxc $fcdistro $pldistro return 0 } @@ -499,6 +378,11 @@ function debian_install () { #virsh -c lxc:/// lxc-enter-namespace $lxc /bin/bash -c "apt-get -y install $DEBIAN_PREINSTALLED" chroot $lxc_root apt-get update chroot $lxc_root apt-get -y install $DEBIAN_PREINSTALLED + # configure hostname + cat < ${lxc_root}/etc/hostname +$GUEST_HOSTNAME +EOF + } function debian_configure () { @@ -539,11 +423,15 @@ function setup_lxc() { pkg_method=$(package_method $fcdistro) case $pkg_method in yum) - fedora_install || { echo "failed to install fedora root image"; exit 1 ; } + if [ -z "$IMAGE" ]; then + fedora_install || { echo "failed to install fedora root image"; exit 1 ; } + fi fedora_configure || { echo "failed to configure fedora for a container"; exit 1 ; } ;; debootstrap) - debian_install $lxc || { echo "failed to install debian/ubuntu root image"; exit 1 ; } + if [ -z "$IMAGE" ]; then + debian_install $lxc || { echo "failed to install debian/ubuntu root image"; exit 1 ; } + fi debian_configure || { echo "failed to configure debian/ubuntu for a container"; exit 1 ; } ;; *) @@ -561,7 +449,7 @@ function setup_lxc() { [ -f $lxc_root/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > $lxc_root/etc/hosts # grant ssh access from host to guest - mkdir $lxc_root/root/.ssh + mkdir -p $lxc_root/root/.ssh cat /root/.ssh/id_rsa.pub >> $lxc_root/root/.ssh/authorized_keys chmod 700 $lxc_root/root/.ssh chmod 600 $lxc_root/root/.ssh/authorized_keys @@ -581,7 +469,7 @@ function write_lxc_xml_test () { cat < $lxc - 524288 + $MEMORY exe /sbin/init @@ -620,7 +508,7 @@ function write_lxc_xml_build () { cat < $lxc - 524288 + $MEMORY exe /sbin/init @@ -719,6 +607,8 @@ function devel_or_vtest_tools () { ( cd /vservers/$lxc/etc/apt ; head -1 sources.list | sed -e s,main,universe, > sources.list.d/universe.list ) # also adding a link to updates sounds about right ( cd /vservers/$lxc/etc/apt ; head -1 sources.list | sed -e 's, main,-updates main,' > sources.list.d/updates.list ) + # tell apt about the changes + chroot /vservers/$lxc apt-get update fi for package in $packages ; do # container not started yet @@ -853,6 +743,8 @@ function usage () { echo " -r repo-url - used to populate yum.repos.d - required in test mode" echo " -P pkgs_file - defines a set of extra packages to install in guest" echo " by default we use devel.pkgs (build mode) or runtime.pkgs (test mode)" + echo " -i image - the location of the rootfs" + echo " -m memory - the amount of allocated memory in MB - defaults to $DEFAULT_MEMORY MB" echo " -v be verbose" exit 1 } @@ -868,7 +760,7 @@ function main () { exit 1 fi - while getopts "n:f:d:p:r:P:v" opt ; do + while getopts "n:f:d:p:r:P:i:m:v" opt ; do case $opt in n) GUEST_HOSTNAME=$OPTARG;; f) fcdistro=$OPTARG;; @@ -876,6 +768,8 @@ function main () { p) personality=$OPTARG;; r) REPO_URL=$OPTARG;; P) PREINSTALLED=$OPTARG;; + i) IMAGE=$OPTARG;; + m) MEMORY=$OPTARG;; v) VERBOSE=true; set -x;; *) usage ;; esac @@ -887,6 +781,7 @@ function main () { [[ -z "$@" ]] && usage lxc=$1 ; shift lxc_root=/vservers/$lxc + # rainchecks almost_empty $lxc_root || \ { echo "container $lxc already exists in $lxc_root - exiting" ; exit 1 ; } @@ -894,6 +789,14 @@ function main () { { echo "container $lxc already exists in libvirt - exiting" ; exit 1 ; } mkdir -p $lxc_root + # if IMAGE, copy the provided rootfs to lxc_root + if [ -n "$IMAGE" ] ; then + [ ! -d "$IMAGE" ] && \ + { echo "$IMAGE rootfs folder does not exist - exiting" ; exit 1 ; } + rsync -a $IMAGE/ $lxc_root/ + fi + + # check we've exhausted the arguments [[ -n "$@" ]] && usage @@ -904,6 +807,10 @@ function main () { [ -z "$fcdistro" ] && fcdistro=$DEFAULT_FCDISTRO [ -z "$pldistro" ] && pldistro=$DEFAULT_PLDISTRO [ -z "$personality" ] && personality=$DEFAULT_PERSONALITY + [ -z "$MEMORY" ] && MEMORY=$DEFAULT_MEMORY + + # set memory in KB + MEMORY=$(($MEMORY * 1024)) # the set of preinstalled packages - depends on mode if [ -z "$PREINSTALLED"] ; then @@ -916,7 +823,7 @@ function main () { if [ -n "$BUILD_MODE" ] ; then # we can now set GUEST_HOSTNAME safely - [ -z "$GUEST_HOSTNAME" ] && GUEST_HOSTNAME=$lxc + [ -z "$GUEST_HOSTNAME" ] && GUEST_HOSTNAME=$(echo $lxc | sed -e 's,\.,-,g') else # as this command can be used in other contexts, not specifying # a repo is considered a warning @@ -945,12 +852,13 @@ function main () { # (build mode relies entirely on dhcp on the private subnet) if [ -z "$BUILD_MODE" ] ; then - create_bridge_if_needed + #create_bridge_if_needed $PUBLIC_BRIDGE + lbuild-bridge.sh $PUBLIC_BRIDGE GUEST_IP=$(gethostbyname $GUEST_HOSTNAME) # use same NETMASK as bridge interface br0 - MASKLEN=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2) - NETMASK=$(masklen_to_netmask $MASKLEN) + masklen=$(ip addr show $PUBLIC_BRIDGE | grep -v inet6 | grep inet | awk '{print $2;}' | cut -d/ -f2) + NETMASK=$(masklen_to_netmask $masklen) GATEWAY=$(ip route show | grep default | awk '{print $3}' | head -1) VIF_HOST="i$(echo $GUEST_HOSTNAME | cut -d. -f1)" fi @@ -963,6 +871,8 @@ function main () { post_install $lxc $personality echo $COMMAND Done + + exit 0 } main "$@"