Renamed install_plugin definition to prevent conflict

definitions/install_plugin.rb → definitions/newrelic_plugin.rb

@@ -1,4 +1,4 @@
-define :install_plugin do
+define :newrelic_plugin do
 
   tar_file = File.join(params[:install_path], "#{params[:name]}-#{params[:plugin_version]}.tar.gz")
 
@@ -38,4 +38,4 @@
     only_if { File.directory?(params[:plugin_path]) && Dir.entries(params[:plugin_path]).sort == %w(. ..) }
   end
 
-end
+end

recipes/aws_cloudwatch.rb

@@ -26,7 +26,7 @@
   package 'libxslt-devel'
 end
 
-install_plugin 'newrelic_aws_cloudwatch_plugin' do
+newrelic_plugin 'newrelic_aws_cloudwatch_plugin' do
   plugin_version   node[:newrelic][:aws_cloudwatch][:version]
   install_path     node[:newrelic][:aws_cloudwatch][:install_path]
   plugin_path      node[:newrelic][:aws_cloudwatch][:plugin_path]

recipes/example.rb

@@ -12,7 +12,7 @@
 
 verify_license_key node[:newrelic][:license_key]
 
-install_plugin 'newrelic_example_plugin' do
+newrelic_plugin 'newrelic_example_plugin' do
   plugin_version   node[:newrelic][:example][:version]
   install_path     node[:newrelic][:example][:install_path]
   plugin_path      node[:newrelic][:example][:plugin_path]

recipes/memcached_java.rb

@@ -13,7 +13,7 @@
 
 verify_license_key node[:newrelic][:license_key]
 
-install_plugin 'newrelic_memcached_java_plugin' do
+newrelic_plugin 'newrelic_memcached_java_plugin' do
   plugin_version   node[:newrelic][:memcached_java][:version]
   install_path     node[:newrelic][:memcached_java][:install_path]
   plugin_path      node[:newrelic][:memcached_java][:plugin_path]

recipes/memcached_ruby.rb

@@ -12,7 +12,7 @@
 
 verify_license_key node[:newrelic][:license_key]
 
-install_plugin 'newrelic_memcached_ruby_plugin' do
+newrelic_plugin 'newrelic_memcached_ruby_plugin' do
   plugin_version   node[:newrelic][:memcached_ruby][:version]
   install_path     node[:newrelic][:memcached_ruby][:install_path]
   plugin_path      node[:newrelic][:memcached_ruby][:plugin_path]

recipes/mysql.rb

@@ -13,7 +13,7 @@
 
 verify_license_key node[:newrelic][:license_key]
 
-install_plugin 'newrelic_mysql_plugin' do
+newrelic_plugin 'newrelic_mysql_plugin' do
   plugin_version   node[:newrelic][:mysql][:version]
   install_path     node[:newrelic][:mysql][:install_path]
   plugin_path      node[:newrelic][:mysql][:plugin_path]

recipes/rackspace_load_balancers.rb

@@ -26,7 +26,7 @@
   package 'libxslt-devel'
 end
 
-install_plugin 'newrelic_rackspace_load_balancers_plugin' do
+newrelic_plugin 'newrelic_rackspace_load_balancers_plugin' do
   plugin_version   node[:newrelic][:rackspace_load_balancers][:version]
   install_path     node[:newrelic][:rackspace_load_balancers][:install_path]
   plugin_path      node[:newrelic][:rackspace_load_balancers][:plugin_path]

recipes/wikipedia_example_java.rb

@@ -12,7 +12,7 @@
 
 verify_license_key node[:newrelic][:license_key]
 
-install_plugin 'newrelic_wikipedia_example_java_plugin' do
+newrelic_plugin 'newrelic_wikipedia_example_java_plugin' do
   plugin_version   node[:newrelic][:wikipedia_example_java][:version]
   install_path     node[:newrelic][:wikipedia_example_java][:install_path]
   plugin_path      node[:newrelic][:wikipedia_example_java][:plugin_path]

recipes/wikipedia_example_ruby.rb

@@ -12,7 +12,7 @@
 
 verify_license_key node[:newrelic][:license_key]
 
-install_plugin 'newrelic_wikipedia_example_ruby_plugin' do
+newrelic_plugin 'newrelic_wikipedia_example_ruby_plugin' do
   plugin_version   node[:newrelic][:wikipedia_example_ruby][:version]
   install_path     node[:newrelic][:wikipedia_example_ruby][:install_path]
   plugin_path      node[:newrelic][:wikipedia_example_ruby][:plugin_path]