commit 4627ac118350588ec56371f5fa9593c4c8e1ed9b
author Jenkins <jenkins@review.openstack.org> Fri Aug 07 14:11:15 2015 +0000
committer Gerrit Code Review <review@openstack.org> Fri Aug 07 14:11:15 2015 +0000
tree bd369f387bd34a9449e038ec80847056ef0a464c
parent 2da606da2e47b7260732bb6ef43f1cbf6b4a1559
parent d73df506f29854997f3b74f1b60968535923316b

Merge "Remove the old meter.yaml path from devstack"

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index ce93ebd..3df75b7 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -211,7 +211,6 @@
     cp $CEILOMETER_DIR/etc/ceilometer/event_pipeline.yaml $CEILOMETER_CONF_DIR
     cp $CEILOMETER_DIR/etc/ceilometer/api_paste.ini $CEILOMETER_CONF_DIR
     cp $CEILOMETER_DIR/etc/ceilometer/event_definitions.yaml $CEILOMETER_CONF_DIR
-    cp $CEILOMETER_DIR/etc/ceilometer/meters.yaml $CEILOMETER_CONF_DIR
     cp $CEILOMETER_DIR/etc/ceilometer/gnocchi_archive_policy_map.yaml $CEILOMETER_CONF_DIR
     cp $CEILOMETER_DIR/etc/ceilometer/gnocchi_resources.yaml $CEILOMETER_CONF_DIR