fix caching so that there is the ability to download services without installing them. This is done with a #NOPRIME comment in apts/files/
This commit is contained in:
parent
a81bbbda93
commit
ca2c047b6e
6 changed files with 13 additions and 11 deletions
|
@ -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
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
curl
|
curl
|
||||||
gcc
|
gcc
|
||||||
memcached
|
memcached # NOPRIME
|
||||||
python-configobj
|
python-configobj
|
||||||
python-coverage
|
python-coverage
|
||||||
python-dev
|
python-dev
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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
|
||||||
|
|
|
@ -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.
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue