Skip to content

Commit b377b82

Browse files
committed
Use warning instead of notify when inform about deprecation.
Some modules ex. puppet-nova still use $cluster_disk_nodes, and when notify is used to inform about deprecation every puppet runs cause rabbitmq server restart.
1 parent bf59be0 commit b377b82

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

manifests/config.pp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@
4444

4545
# Handle deprecated option.
4646
if $cluster_disk_nodes != [] {
47-
notify { 'cluster_disk_nodes':
48-
message => 'WARNING: The cluster_disk_nodes is deprecated.
49-
Use cluster_nodes instead.',
50-
}
47+
warning('The $cluster_disk_nodes is deprecated. Use $cluster_nodes instead.')
5148
$r_cluster_nodes = $cluster_disk_nodes
5249
} else {
5350
$r_cluster_nodes = $cluster_nodes

spec/classes/rabbitmq_spec.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@
108108
end
109109
end
110110

111-
context 'deprecated parameters' do
112-
describe 'cluster_disk_nodes' do
113-
let(:params) {{ :cluster_disk_nodes => ['node1', 'node2'] }}
114-
115-
it { should contain_notify('cluster_disk_nodes') }
116-
end
117-
end
118-
119111
describe 'manages configuration directory correctly' do
120112
it { should contain_file('/etc/rabbitmq').with(
121113
'ensure' => 'directory'

0 commit comments

Comments
 (0)