Merge "Remove ceilometer in favor of plugin"

clean.sh

@@ -64,7 +64,7 @@ if [[ -d $TARGET_DEVSTACK_DIR ]]; then
 fi
 
 # Clean out /etc
-sudo rm -rf /etc/keystone /etc/glance /etc/nova /etc/cinder /etc/swift /etc/neutron /etc/ceilometer
+sudo rm -rf /etc/keystone /etc/glance /etc/nova /etc/cinder /etc/swift /etc/neutron
 
 # Clean out tgt
 sudo rm /etc/tgt/conf.d/*

functions

@@ -79,11 +79,6 @@ function save_data {
     echo_summary "Dumping $release databases"
     mkdir -p $SAVE_DIR
     save_mysql_dbs $release $dir
-
-    # TODO(sdague): this should go into per project save-state scripts
-    if grep -q 'connection *= *mongo' /etc/ceilometer/ceilometer.conf; then
-        mongodump --db ceilometer --out $SAVE_DIR/ceilometer-dump.$release
-    fi
 }
 
 function worlddump {

projects/20_ceilometer/settings

@@ -1,7 +0,0 @@
-register_project_for_upgrade ceilometer
-if [ ! -f /etc/ceilometer/ceilometer.conf ]; then
-    return
-fi
-if grep -q 'connection *= *mysql' /etc/ceilometer/ceilometer.conf; then
-    register_db_to_save ceilometer
-fi

projects/20_ceilometer/shutdown.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-#
-
-set -o errexit
-
-source $GRENADE_DIR/grenaderc
-source $GRENADE_DIR/functions
-
-# We need base DevStack functions for this
-source $BASE_DEVSTACK_DIR/functions
-source $BASE_DEVSTACK_DIR/stackrc # needed for status directory
-source $BASE_DEVSTACK_DIR/lib/tls
-source $BASE_DEVSTACK_DIR/lib/apache
-source $BASE_DEVSTACK_DIR/lib/ceilometer
-
-set -o xtrace
-
-stop_ceilometer

projects/20_ceilometer/upgrade.sh

@@ -1,64 +0,0 @@
-#!/usr/bin/env bash
-
-# ``upgrade-ceilometer``
-
-echo "*********************************************************************"
-echo "Begin $0"
-echo "*********************************************************************"
-
-# Clean up any resources that may be in use
-cleanup() {
-    set +o errexit
-
-    echo "*********************************************************************"
-    echo "ERROR: Abort $0"
-    echo "*********************************************************************"
-
-    # Kill ourselves to signal any calling process
-    trap 2; kill -2 $$
-}
-
-trap cleanup SIGHUP SIGINT SIGTERM
-
-# Keep track of the grenade directory
-RUN_DIR=$(cd $(dirname "$0") && pwd)
-
-# Source params
-source $GRENADE_DIR/grenaderc
-
-# Import common functions
-source $GRENADE_DIR/functions
-
-# This script exits on an error so that errors don't compound and you see
-# only the first error that occurred.
-set -o errexit
-
-
-# Upgrade Ceilometer
-# ==================
-
-# Get functions from current DevStack
-source $TARGET_DEVSTACK_DIR/stackrc
-source $BASE_DEVSTACK_DIR/lib/apache
-source $TARGET_DEVSTACK_DIR/lib/ceilometer
-
-# Print the commands being run so that we can see the command that triggers
-# an error.  It is also useful for following allowing as the install occurs.
-set -o xtrace
-
-# install_ceilometer()
-stack_install_service ceilometer
-
-# calls upgrade-ceilometer for specific release
-upgrade_project ceilometer $RUN_DIR $BASE_DEVSTACK_BRANCH $TARGET_DEVSTACK_BRANCH
-
-# Migrate the database
-$CEILOMETER_BIN_DIR/ceilometer-dbsync || die $LINENO "DB sync error"
-
-# Start Ceilometer
-start_ceilometer
-
-set +o xtrace
-echo "*********************************************************************"
-echo "SUCCESS: End $0"
-echo "*********************************************************************"

upgrade-tempest

@@ -49,7 +49,6 @@ FILES=$TARGET_DEVSTACK_DIR/files
 
 # Ensure all services libraries are sourced early to correctly populate
 # TEMPEST_SERVICES.
-source $TARGET_DEVSTACK_DIR/lib/ceilometer
 source $TARGET_DEVSTACK_DIR/lib/cinder
 source $TARGET_DEVSTACK_DIR/lib/glance
 source $TARGET_DEVSTACK_DIR/lib/horizon