openstack/devstack
Code Issues Proposed changes

Merge pull request #13 from dtroyer/master

Browse Source 
Fix munin, kernel modules in container
This commit is contained in:
Dean Troyer 2011-09-21 19:55:41 -07:00
commit 8bdd48dbdb
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_lxc.sh
View File

@ -29,6 +29,7 @@ if ! which cgdelete | grep -q cgdelete; then
cd libcgroup-0.37.1 cd libcgroup-0.37.1
./configure ./configure
make install make install
ldconfig
fi fi
# Create lxc configuration # Create lxc configuration
@ -99,6 +100,11 @@ echo stack:pass | chroot $ROOTFS chpasswd
# stack requires) # stack requires)
echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers echo "stack ALL=(ALL) NOPASSWD: ALL" >> $ROOTFS/etc/sudoers
# Copy kernel modules
mkdir -p $ROOTFS/lib/modules/`uname -r`/kernel
cp -p /lib/modules/`uname -r`/modules.dep $ROOTFS/lib/modules/`uname -r`/
cp -pR /lib/modules/`uname -r`/kernel/net $ROOTFS/lib/modules/`uname -r`/kernel/
# Gracefully cp only if source file/dir exists # Gracefully cp only if source file/dir exists
function cp_it { function cp_it {
if [ -e $1 ] || [ -d $1 ]; then if [ -e $1 ] || [ -d $1 ]; then

4
stack.sh
View File

@ -74,7 +74,7 @@ NOVNC_DIR=$DEST/noVNC
MUNIN_DIR=$DEST/openstack-munin MUNIN_DIR=$DEST/openstack-munin
# Specify which services to launch. These generally correspond to screen tabs # Specify which services to launch. These generally correspond to screen tabs
ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit} ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit,munin}
# Use the first IP unless an explicit is set by ``HOST_IP`` environment variable # Use the first IP unless an explicit is set by ``HOST_IP`` environment variable
if [ ! -n "$HOST_IP" ]; then if [ ! -n "$HOST_IP" ]; then
@ -302,7 +302,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
# qcow images) and kvm (hardware based virtualization). If unable to # qcow images) and kvm (hardware based virtualization). If unable to
# load kvm, set the libvirt type to qemu. # load kvm, set the libvirt type to qemu.
sudo modprobe nbd || true sudo modprobe nbd || true
if ! -e /dev/kvm; then if [ ! -e /dev/kvm ]; then
LIBVIRT_TYPE=qemu LIBVIRT_TYPE=qemu
fi fi
# User needs to be member of libvirtd group for nova-compute to use libvirt. # User needs to be member of libvirtd group for nova-compute to use libvirt.