Maint. Removing code for which no CLA has been signed

Multiple attemps were made to contact the author of this code in order to
obtain a Contributor Licence Agreement, but we were unable to do so.

4 files changed, 8 insertions, 33 deletions

diff --git a/ext/puppetstoredconfigclean.rb b/ext/puppetstoredconfigclean.rb
index 9b7b0c8a7..16f39efa1 100644
--- a/ext/puppetstoredconfigclean.rb
+++ b/ext/puppetstoredconfigclean.rb
@@ -70,8 +70,6 @@ case adapter
     args[:port]     = pm_conf[:dbport] unless pm_conf[:dbport].to_s.empty?
     socket          = pm_conf[:dbsocket]
     args[:socket]   = socket unless socket.to_s.empty?
-    connections     = pm_conf[:dbconnections].to_i
-    args[:pool]     = connections if connections > 0
   else
     raise ArgumentError, "Invalid db adapter #{adapter}"
 end
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb
index 972e9e66c..72b1af188 100644
--- a/lib/puppet/defaults.rb
+++ b/lib/puppet/defaults.rb
@@ -665,9 +665,6 @@ module Puppet
       used when networked databases are used."],
     :dbsocket => [ "", "The database socket location. Only used when networked
       databases are used.  Will be ignored if the value is an empty string."],
-    :dbconnections => [ 0, "The number of database connections. Only used when
-      networked databases are used.  Will be ignored if the value is an empty
-      string or is less than 1."],
     :railslog => {:default => "$logdir/rails.log",
       :mode => 0600,
       :owner => "service",
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index c2d492fdd..44e7a8343 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -57,16 +57,10 @@ module Puppet::Rails
 
       socket          = Puppet[:dbsocket]
       args[:socket]   = socket unless socket.to_s.empty?
-
-      connections     = Puppet[:dbconnections].to_i
-      args[:pool]     = connections if connections > 0
     when "oracle_enhanced":
       args[:database] = Puppet[:dbname] unless Puppet[:dbname].to_s.empty?
       args[:username] = Puppet[:dbuser] unless Puppet[:dbuser].to_s.empty?
       args[:password] = Puppet[:dbpassword] unless Puppet[:dbpassword].to_s.empty?
-
-      connections     = Puppet[:dbconnections].to_i
-      args[:pool]     = connections if connections > 0
     else
       raise ArgumentError, "Invalid db adapter #{adapter}"
     end
diff --git a/spec/unit/rails_spec.rb b/spec/unit/rails_spec.rb
index 01e822ff3..8dfc09b4a 100755
--- a/spec/unit/rails_spec.rb
+++ b/spec/unit/rails_spec.rb
@@ -105,7 +105,6 @@ describe Puppet::Rails, "when initializing a mysql connection" do
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
     Puppet.settings.stubs(:value).with(:dbsocket).returns("")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "mysql",
@@ -114,8 +113,7 @@ describe Puppet::Rails, "when initializing a mysql connection" do
       :username => "testuser",
       :password => "testpassword",
       :database => "testname",
-      :reconnect => true,
-      :pool => 1
+      :reconnect => true
     }
   end
 
@@ -128,7 +126,6 @@ describe Puppet::Rails, "when initializing a mysql connection" do
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
     Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "mysql",
@@ -139,8 +136,7 @@ describe Puppet::Rails, "when initializing a mysql connection" do
       :password => "testpassword",
       :database => "testname",
       :socket => "testsocket",
-      :reconnect => true,
-      :pool => 1
+      :reconnect => true
     }
   end
 
@@ -153,7 +149,6 @@ describe Puppet::Rails, "when initializing a mysql connection" do
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
     Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "mysql",
@@ -164,8 +159,7 @@ describe Puppet::Rails, "when initializing a mysql connection" do
       :password => "testpassword",
       :database => "testname",
       :socket => "testsocket",
-      :reconnect => true,
-      :pool => 1
+      :reconnect => true
     }
   end
 end
@@ -182,7 +176,6 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
     Puppet.settings.stubs(:value).with(:dbsocket).returns("")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "postgresql",
@@ -192,8 +185,7 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
       :username => "testuser",
       :password => "testpassword",
       :database => "testname",
-      :reconnect => true,
-      :pool => 1
+      :reconnect => true
     }
   end
 
@@ -206,7 +198,6 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
     Puppet.settings.stubs(:value).with(:dbsocket).returns("testsocket")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "postgresql",
@@ -217,7 +208,6 @@ describe Puppet::Rails, "when initializing a postgresql connection" do
       :password => "testpassword",
       :database => "testname",
       :socket => "testsocket",
-      :pool => 1,
       :reconnect => true
     }
   end
@@ -226,39 +216,35 @@ end
 describe Puppet::Rails, "when initializing an Oracle connection" do
   confine "Cannot test without ActiveRecord" => Puppet.features.rails?
 
-  it "should provide the adapter, log_level, and username, password, dbconnections, and database arguments" do
+  it "should provide the adapter, log_level, and username, password, and database arguments" do
     Puppet.settings.stubs(:value).with(:dbadapter).returns("oracle_enhanced")
     Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel")
     Puppet.settings.stubs(:value).with(:dbuser).returns("testuser")
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "oracle_enhanced",
       :log_level => "testlevel",
       :username => "testuser",
       :password => "testpassword",
-      :database => "testname",
-      :pool => 1
+      :database => "testname"
     }
   end
 
-  it "should provide the adapter, log_level, and host, username, password, database, pool, and socket arguments" do
+  it "should provide the adapter, log_level, and host, username, password, database and socket arguments" do
     Puppet.settings.stubs(:value).with(:dbadapter).returns("oracle_enhanced")
     Puppet.settings.stubs(:value).with(:rails_loglevel).returns("testlevel")
     Puppet.settings.stubs(:value).with(:dbuser).returns("testuser")
     Puppet.settings.stubs(:value).with(:dbpassword).returns("testpassword")
     Puppet.settings.stubs(:value).with(:dbname).returns("testname")
-    Puppet.settings.stubs(:value).with(:dbconnections).returns(1)
 
     Puppet::Rails.database_arguments.should == {
       :adapter => "oracle_enhanced",
       :log_level => "testlevel",
       :username => "testuser",
       :password => "testpassword",
-      :database => "testname",
-      :pool => 1
+      :database => "testname"
     }
   end
 end