josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #161 from cloudbuilders/lessapt

Browse source 
rework how pre-caching works.  add the ability to flag  packages #NOPRIME in files/apts so that services that can't be installed with chroot can be skipped.
This commit is contained in:
sleepsonthefloor 2011-11-04 11:43:47 -07:00
commit 5f3f21f677
6 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
files/apts/nova
View file

@ -2,7 +2,7 @@ dnsmasq-base
kpartx kpartx
parted parted
arping # used for send_arp_for_ha option in nova-network arping # used for send_arp_for_ha option in nova-network
mysql-server mysql-server # NOPRIME
python-mysqldb python-mysqldb
kvm kvm
gawk gawk
@ -11,10 +11,10 @@ ebtables
sqlite3 sqlite3
sudo sudo
kvm kvm
libvirt-bin libvirt-bin # NOPRIME
vlan vlan
curl curl
rabbitmq-server rabbitmq-server # NOPRIME
socat # used by ajaxterm socat # used by ajaxterm
python-mox python-mox
python-paste python-paste

2
files/apts/swift
View file

@ -1,6 +1,6 @@
curl curl
gcc gcc
memcached memcached # NOPRIME
python-configobj python-configobj
python-coverage python-coverage
python-dev python-dev

4
tools/build_libvirt.sh
View file

@ -145,8 +145,8 @@ function git_clone {
# Make sure that base requirements are installed # Make sure that base requirements are installed
cp /etc/resolv.conf $COPY_DIR/etc/resolv.conf cp /etc/resolv.conf $COPY_DIR/etc/resolv.conf
chroot $COPY_DIR apt-get update chroot $COPY_DIR apt-get update
chroot $COPY_DIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server|memcached)"` chroot $COPY_DIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`
chroot $COPY_DIR apt-get install -y --download-only rabbitmq-server libvirt-bin mysql-server chroot $COPY_DIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`
chroot $COPY_DIR pip install `cat files/pips/*` chroot $COPY_DIR pip install `cat files/pips/*`
# Clean out code repos if directed to do so # Clean out code repos if directed to do so

4
tools/build_lxc.sh
View file

@ -125,8 +125,8 @@ fi
# Make sure that base requirements are installed # Make sure that base requirements are installed
chroot $CACHEDIR apt-get update chroot $CACHEDIR apt-get update
chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server|memcached)"` chroot $CACHEDIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`
chroot $CACHEDIR apt-get install -y --download-only rabbitmq-server libvirt-bin mysql-server chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`
chroot $CACHEDIR pip install `cat files/pips/*` chroot $CACHEDIR pip install `cat files/pips/*`
# Clean out code repos if directed to do so # Clean out code repos if directed to do so

5
tools/build_nfs.sh
View file

@ -32,8 +32,9 @@ fi
# prime natty with as many apt/pips as we can # prime natty with as many apt/pips as we can
if [ ! -d $CHROOTCACHE/natty-dev ]; then if [ ! -d $CHROOTCACHE/natty-dev ]; then
rsync -azH $CHROOTCACHE/natty-base/ $CHROOTCACHE/natty-dev/ rsync -azH $CHROOTCACHE/natty-base/ $CHROOTCACHE/natty-dev/
chroot $CHROOTCACHE/natty-dev apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"` chroot $CHROOTCACHE apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`
chroot $CHROOTCACHE/natty-dev pip install `cat files/pips/*` chroot $CHROOTCACHE apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`
chroot $CHROOTCACHE pip install `cat files/pips/*`
# Create a stack user that is a member of the libvirtd group so that stack # Create a stack user that is a member of the libvirtd group so that stack
# is able to interact with libvirt. # is able to interact with libvirt.

3
tools/build_ramdisk.sh
View file

@ -113,7 +113,8 @@ if [ ! -r $DEV_FILE ]; then
mount -t ext4 ${NBD}p1 $MNTDIR mount -t ext4 ${NBD}p1 $MNTDIR
cp -p /etc/resolv.conf $MNTDIR/etc/resolv.conf cp -p /etc/resolv.conf $MNTDIR/etc/resolv.conf
chroot $MNTDIR apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"` chroot $MNTDIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`
chroot $MNTDIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`
chroot $MNTDIR pip install `cat files/pips/*` chroot $MNTDIR pip install `cat files/pips/*`
# Create a stack user that is a member of the libvirtd group so that stack # Create a stack user that is a member of the libvirtd group so that stack