@@ -98,7 +98,7 @@ if [ ! -f $CACHEDIR/bootstrapped ]; then

     # trigger the initial debootstrap

     lxc-create -n $CONTAINER -t natty -f $LXC_CONF

     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|munin-node)"`

+    chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`

     chroot $CACHEDIR pip install `cat files/pips/*`

     touch $CACHEDIR/bootstrapped

 fi

@@ -115,10 +115,8 @@ git_clone $GLANCE_REPO $CACHEDIR/$DEST/glance $GLANCE_BRANCH

 git_clone $KEYSTONE_REPO $CACHEDIR/$DESTkeystone $KEYSTONE_BRANCH

 git_clone $NOVNC_REPO $CACHEDIR/$DEST/novnc $NOVNC_BRANCH

 git_clone $DASH_REPO $CACHEDIR/$DEST/dash $DASH_BRANCH $DASH_TAG

-git_clone $NIXON_REPO $CACHEDIR/$DEST/nixon $NIXON_BRANCH

 git_clone $NOVACLIENT_REPO $CACHEDIR/$DEST/python-novaclient $NOVACLIENT_BRANCH

 git_clone $OPENSTACKX_REPO $CACHEDIR/$DEST/openstackx $OPENSTACKX_BRANCH

-git_clone $MUNIN_REPO $CACHEDIR/$DEST/openstack-munin $MUNIN_BRANCH

 # Use this version of devstack?

 if [ "$USE_CURRENT_DEVSTACK" = "1" ]; then

@@ -23,10 +23,8 @@ if [ ! -d proto ]; then

     git_clone $KEYSTONE_REPO proto/opt/keystone $KEYSTONE_BRANCH

     git_clone $NOVNC_REPO proto/opt/novnc $NOVNC_BRANCH

     git_clone $DASH_REPO proto/opt/dash $DASH_BRANCH $DASH_TAG

-    git_clone $NIXON_REPO proto/opt/nixon $NIXON_BRANCH

     git_clone $NOVACLIENT_REPO proto/opt/python-novaclient $NOVACLIENT_BRANCH

     git_clone $OPENSTACKX_REPO proto/opt/openstackx $OPENSTACKX_BRANCH

-    git_clone $MUNIN_REPO proto/opt/openstack-munin $MUNIN_BRANCH

     chroot proto mkdir -p /opt/files

     wget -c http://images.ansolabs.com/tty.tgz -O proto/opt/files/tty.tgz

 fi

@@ -81,10 +81,8 @@ git_clone $GLANCE_REPO /opt/stack/glance $GLANCE_BRANCH

 git_clone $KEYSTONE_REPO /opt/stack/keystone $KEYSTONE_BRANCH

 git_clone $NOVNC_REPO /opt/stack/novnc $NOVNC_BRANCH

 git_clone $DASH_REPO /opt/stack/dash $DASH_BRANCH

-git_clone $NIXON_REPO /opt/stack/nixon $NIXON_BRANCH

 git_clone $NOVACLIENT_REPO /opt/stack/python-novaclient $NOVACLIENT_BRANCH

 git_clone $OPENSTACKX_REPO /opt/stack/openstackx $OPENSTACKX_BRANCH

-git_clone $MUNIN_REPO /opt/stack/openstack-munin $MUNIN_BRANCH

 # build a new image

 BASE=build.$$

@@ -11,6 +11,5 @@ lsof # useful when debugging

 openssh-server

 vim-nox

 locate # useful when debugging

-munin

 python-virtualenv

 python-unittest2

@@ -17,10 +17,9 @@ DATABASES = {

 CACHE_BACKEND = 'dummy://'

-# Add nixon + other apps to dash installation.

+# Add apps to dash installation.

 INSTALLED_APPS = (

     'dashboard',

-    'dashboard.nixon',

     'django.contrib.contenttypes',

     'django.contrib.sessions',

     'django.contrib.messages',

@@ -61,7 +60,7 @@ QUANTUM_PORT = '9696'

 QUANTUM_TENANT = '1234'

 QUANTUM_CLIENT_VERSION='0.1'

-# We use nixon to embed instead of external monitoring links

+# No monitoring links currently

 EXTERNAL_MONITORING = []

 # Uncomment the following segment to silence most logging

@@ -97,16 +97,14 @@ sudo chown `whoami` $DEST

 # Set the destination directories for openstack projects

 NOVA_DIR=$DEST/nova

 DASH_DIR=$DEST/dash

-NIXON_DIR=$DEST/dash/openstack-dashboard/dashboard/nixon

 GLANCE_DIR=$DEST/glance

 KEYSTONE_DIR=$DEST/keystone

 NOVACLIENT_DIR=$DEST/python-novaclient

 OPENSTACKX_DIR=$DEST/openstackx

 NOVNC_DIR=$DEST/noVNC

-MUNIN_DIR=$DEST/openstack-munin

 # 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,munin}

+ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash,mysql,rabbit}

 # Use the first IP unless an explicit is set by ``HOST_IP`` environment variable

 if [ ! -n "$HOST_IP" ]; then

@@ -193,15 +191,11 @@ git_clone $KEYSTONE_REPO $KEYSTONE_DIR $KEYSTONE_BRANCH

 git_clone $NOVNC_REPO $NOVNC_DIR $NOVNC_BRANCH

 # django powered web control panel for openstack

 git_clone $DASH_REPO $DASH_DIR $DASH_BRANCH $DASH_TAG

-# add nixon, will use this to show munin graphs in dashboard

-git_clone $NIXON_REPO $NIXON_DIR $NIXON_BRANCH

 # python client library to nova that dashboard (and others) use

 git_clone $NOVACLIENT_REPO $NOVACLIENT_DIR $NOVACLIENT_BRANCH

 # openstackx is a collection of extensions to openstack.compute & nova

 # that is *deprecated*.  The code is being moved into python-novaclient & nova.

 git_clone $OPENSTACKX_REPO $OPENSTACKX_DIR $OPENSTACKX_BRANCH

-# openstack-munin is a collection of munin plugins for monitoring the stack

-git_clone $MUNIN_REPO $MUNIN_DIR $MUNIN_BRANCH

 # Initialization

 # ==============

@@ -262,7 +256,6 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then

     cd $DASH_DIR/openstack-dashboard

-    # Includes settings for Nixon, to expose munin charts.

     sudo cp $FILES/dash_settings.py local/local_settings.py

     dashboard/manage.py syncdb

@@ -277,33 +270,6 @@ if [[ "$ENABLED_SERVICES" =~ "dash" ]]; then

 fi

-# Munin

-# -----

-

-# Munin is accessable via apache and was configured in the dashboard section.

-

-if [[ "$ENABLED_SERVICES" =~ "munin" ]]; then

-    # allow connections from other hosts

-    sudo sed -i -e 's/Allow from localhost/Allow from all/g' /etc/munin/apache.conf

-

-    cat >/tmp/nova <<EOF

-[keystone_*]

-user `whoami`

-

-[nova_*]

-user `whoami`

-EOF

-    sudo mv /tmp/nova /etc/munin/plugin-conf.d/nova

-    # configure Munin for Nova plugins

-    PLUGINS="keystone_stats nova_floating_ips nova_instance_launched nova_instance_ nova_instance_timing nova_services"

-    for i in $PLUGINS; do

-      sudo cp -p $MUNIN_DIR/$i /usr/share/munin/plugins

-      sudo ln -sf /usr/share/munin/plugins/$i /etc/munin/plugins

-    done

-    sudo mv /etc/munin/plugins/nova_instance_ /etc/munin/plugins/nova_instance_launched

-    sudo restart munin-node

-fi

-

 # Glance

 # ------

@@ -18,10 +18,6 @@ NOVNC_BRANCH=master

 DASH_REPO=https://github.com/cloudbuilders/openstack-dashboard.git

 DASH_BRANCH=master

-# add nixon, will use this to show munin graphs in dashboard

-NIXON_REPO=https://github.com/cloudbuilders/nixon.git

-NIXON_BRANCH=diablo

-

 # python client library to nova that dashboard (and others) use

 NOVACLIENT_REPO=https://github.com/cloudbuilders/python-novaclient.git

 NOVACLIENT_BRANCH=master

@@ -31,10 +27,6 @@ NOVACLIENT_BRANCH=master

 OPENSTACKX_REPO=https://github.com/cloudbuilders/openstackx.git

 OPENSTACKX_BRANCH=diablo

-# openstack-munin is a collection of munin plugins for monitoring the stack

-MUNIN_REPO=https://github.com/cloudbuilders/openstack-munin.git

-MUNIN_BRANCH=master

-

 # allow local overrides of env variables

 if [ -f ./localrc ]; then

     source ./localrc