x
/
fuel-plugin-openstack-telemetry
Code Issues Proposed changes

Fix conflict in master 

Change-Id: Id89a6c7c56c86ab03f406b5c1858cb59e0bb0d4c
This commit is contained in:
Roman Babyuk 2016-09-15 12:01:58 +03:00
parent 36c122453b
commit ef02ff99d2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
deployment_scripts/puppet/manifests/hindsight.pp
View File

@ -98,16 +98,12 @@ $configs = {
"${run_dir}/output/influxdb_ceilometer.cfg" => {
content => template( "${templates}/output/influxdb_ceilometer.cfg.erb"),
},
<<<<<<< HEAD
"${run_dir}/input/kafka_input.cfg" => {
=======
"${run_dir}/output/elasticsearch_ceilometer.cfg" => {
content => template( "${templates}/output/elasticsearch_ceilometer.cfg.erb"),
},
"${run_dir}/input/ceilometer_kafka.cfg" => {
>>>>>>> Add resource decoder to Hindsight lua plugins
"${run_dir}/input/kafka_input.cfg" => {
content => template( "${templates}/input/kafka_input.cfg.erb"),
}
},
}
create_resources(file, $configs, $files_defaults)