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

Merge branch 'master' of github.com:cloudbuilders/devstack

Browse source
This commit is contained in:
Anthony Young 2011-09-19 14:47:46 -07:00
commit f2384cf473
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
build_lxc.sh
View file

@ -1,4 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Configurable params # Configurable params
BRIDGE=${BRIDGE:-br0} BRIDGE=${BRIDGE:-br0}
CONTAINER=${CONTAINER:-STACK} CONTAINER=${CONTAINER:-STACK}
@ -49,9 +50,13 @@ if [ -d /cgroup/$CONTAINER ]; then
cgdelete -r cpu,net_cls:$CONTAINER cgdelete -r cpu,net_cls:$CONTAINER
fi fi
# Warm the base image on first install # Warm the base image on first install
CACHEDIR=/var/cache/lxc/natty/rootfs-amd64 CACHEDIR=/var/cache/lxc/natty/rootfs-amd64
if [ ! -d $CACHEDIR ]; then if [ ! -d $CACHEDIR ]; then
# by deleting the container, we force lxc-create to re-bootstrap (lxc is
# lazy and doesn't do anything if a container already exists)
lxc-destroy -n $CONTAINER
# trigger the initial debootstrap # trigger the initial debootstrap
lxc-create -n $CONTAINER -t natty -f $LXC_CONF lxc-create -n $CONTAINER -t natty -f $LXC_CONF
chroot $CACHEDIR apt-get update chroot $CACHEDIR apt-get update

10
files/dash_settings.py
View file

@ -61,14 +61,8 @@ QUANTUM_PORT = '9696'
QUANTUM_TENANT = '1234' QUANTUM_TENANT = '1234'
QUANTUM_CLIENT_VERSION='0.1' QUANTUM_CLIENT_VERSION='0.1'
# If you have external monitoring links # We use nixon to embed instead of external monitoring links
EXTERNAL_MONITORING = [ EXTERNAL_MONITORING = []
['Nagios','http://foo.com'],
['Ganglia','http://bar.com'],
]
# If you do not have external monitoring links
# EXTERNAL_MONITORING = []
# Uncomment the following segment to silence most logging # Uncomment the following segment to silence most logging
# django.db and boto DEBUG logging is extremely verbose. # django.db and boto DEBUG logging is extremely verbose.