diff --git a/build_lxc.sh b/build_lxc.sh index 191c493a77..643da7e4be 100755 --- a/build_lxc.sh +++ b/build_lxc.sh @@ -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 diff --git a/build_nfs.sh b/build_nfs.sh index fa3e3ef89c..6434df42b6 100755 --- a/build_nfs.sh +++ b/build_nfs.sh @@ -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 diff --git a/build_pxe_ramdisk.sh b/build_pxe_ramdisk.sh index 197bfc94e4..a9b9225b9d 100755 --- a/build_pxe_ramdisk.sh +++ b/build_pxe_ramdisk.sh @@ -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.$$ diff --git a/files/apts/general b/files/apts/general index ce48b0005e..7aee9bc035 100644 --- a/files/apts/general +++ b/files/apts/general @@ -11,6 +11,5 @@ lsof # useful when debugging openssh-server vim-nox locate # useful when debugging -munin python-virtualenv python-unittest2 diff --git a/files/dash_settings.py b/files/dash_settings.py index 10a3295cfc..74d0350deb 100644 --- a/files/dash_settings.py +++ b/files/dash_settings.py @@ -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 diff --git a/stack.sh b/stack.sh index 2c81820d6f..dd54d0ba2d 100755 --- a/stack.sh +++ b/stack.sh @@ -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 <