diff --git a/spec/classes/ceilometer_agent_notification_spec.rb b/spec/classes/ceilometer_agent_notification_spec.rb index 48720097..16bc8112 100644 --- a/spec/classes/ceilometer_agent_notification_spec.rb +++ b/spec/classes/ceilometer_agent_notification_spec.rb @@ -27,8 +27,8 @@ describe 'ceilometer::agent::notification' do end let :params do - { :manage_service => true, - :enabled => true } + { :manage_service => true, + :enabled => true } end shared_examples_for 'ceilometer-agent-notification' do @@ -125,7 +125,6 @@ describe 'ceilometer::agent::notification' do " - event_sink", "sinks:", " - name: event_sink", - " transformers:", " publishers:", " - gnocchi://", ])} @@ -148,7 +147,6 @@ describe 'ceilometer::agent::notification' do " - event_sink", "sinks:", " - name: event_sink", - " transformers:", " publishers:", " - notifier://", " - notifier://?topic=alarm.all", @@ -165,9 +163,8 @@ describe 'ceilometer::agent::notification' do 'sinks' => ['my_event_sink'], ], 'sinks' => [ - 'name' => 'my_event_sink', - 'transformers' => [], - 'publishers' => ['gnocchi://'], + 'name' => 'my_event_sink', + 'publishers' => ['gnocchi://'], ], } )} @@ -182,7 +179,6 @@ sources: - my_event_sink sinks: - name: my_event_sink - transformers: [] publishers: - gnocchi:// ', @@ -219,9 +215,8 @@ sinks: 'sinks' => ['my_sink'], ], 'sinks' => [ - 'name' => 'my_sink', - 'transformers' => [], - 'publishers' => ['gnocchi://'], + 'name' => 'my_sink', + 'publishers' => ['gnocchi://'], ], } )} @@ -236,7 +231,6 @@ sources: - my_sink sinks: - name: my_sink - transformers: [] publishers: - gnocchi:// ', diff --git a/templates/event_pipeline.yaml.erb b/templates/event_pipeline.yaml.erb index 9a46fbfc..39c2f664 100644 --- a/templates/event_pipeline.yaml.erb +++ b/templates/event_pipeline.yaml.erb @@ -7,7 +7,6 @@ sources: - event_sink sinks: - name: event_sink - transformers: publishers: <% @event_pipeline_publishers.each do |publisher| -%> - <%= publisher %>