Merge pull request redhat-openstack#233 from michalskalski/master

Use warning instead of notify when inform about deprecation.
jguiditta · Dec 4, 2014 · 983a2aa · 983a2aa
2 parents f8b9936 + b377b82
commit 983a2aa
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/manifests/config.pp b/manifests/config.pp
@@ -47,10 +47,7 @@
 
   # Handle deprecated option.
   if $cluster_disk_nodes != [] {
-    notify { 'cluster_disk_nodes':
-      message => 'WARNING: The cluster_disk_nodes is deprecated.
-       Use cluster_nodes instead.',
-    }
+    warning('The $cluster_disk_nodes is deprecated. Use $cluster_nodes instead.')
     $r_cluster_nodes = $cluster_disk_nodes
   } else {
     $r_cluster_nodes = $cluster_nodes

diff --git a/spec/classes/rabbitmq_spec.rb b/spec/classes/rabbitmq_spec.rb
@@ -98,14 +98,6 @@
         end
       end
 
-      context 'deprecated parameters' do
-        describe 'cluster_disk_nodes' do
-          let(:params) {{ :cluster_disk_nodes => ['node1', 'node2'] }}
-
-          it { should contain_notify('cluster_disk_nodes') }
-        end
-      end
-
       describe 'manages configuration directory correctly' do
         it { should contain_file('/etc/rabbitmq').with(
           'ensure' => 'directory'