diff options
Diffstat (limited to 'lib/puppet/rails.rb')
| -rw-r--r-- | lib/puppet/rails.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb index c3bf383bb..c0eedfcde 100644 --- a/lib/puppet/rails.rb +++ b/lib/puppet/rails.rb @@ -11,7 +11,7 @@ module Puppet::Rails # the state dir on every test. return if ActiveRecord::Base.connected? - Puppet.settings.use(:main, :rails, :puppetmasterd) + Puppet.settings.use(:main, :rails, :master) ActiveRecord::Base.logger = Logger.new(Puppet[:railslog]) begin @@ -131,7 +131,7 @@ module Puppet::Rails raise Puppet::DevError, "No activerecord, cannot init Puppet::Rails" end - Puppet.settings.use(:puppetmasterd, :rails) + Puppet.settings.use(:master, :rails) begin ActiveRecord::Base.establish_connection(database_arguments()) |