commit 06178aa5fa50ac61006a646b71f4e81be046f5cc
author Jenkins <jenkins@review.openstack.org> Fri Feb 08 15:29:01 2013 +0000
committer Gerrit Code Review <review@openstack.org> Fri Feb 08 15:29:01 2013 +0000
tree d2ec205c97fccff92461caff218ab3004a341194
parent f127e2f316f1161bacdf4cccdbc3e56b2b8a54a8
parent 8407b2de2ad0e83690c9f1b193b50b984a40ddfb

Merge "Copy the pipeline configuration file"

lib/ceilometer

diff --git a/lib/ceilometer b/lib/ceilometer
index 41a5f53..bc37d92 100644
--- a/lib/ceilometer
+++ b/lib/ceilometer
@@ -73,6 +73,7 @@
 
     # Install the policy file for the API server
     cp $CEILOMETER_DIR/etc/ceilometer/policy.json $CEILOMETER_CONF_DIR
+    cp $CEILOMETER_DIR/etc/ceilometer/pipeline.yaml $CEILOMETER_CONF_DIR
     iniset $CEILOMETER_CONF DEFAULT policy_file $CEILOMETER_CONF_DIR/policy.json
 
     # the compute and central agents need these credentials in order to