diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2010-05-12 18:16:29 -0700 |
|---|---|---|
| committer | test branch <puppet-dev@googlegroups.com> | 2010-02-17 06:50:53 -0800 |
| commit | fc2904955ca6e77bda8719671df200e0811c38cd (patch) | |
| tree | bf8b3c461e0bb7f406cabd0e2420e675df5bcfd4 /lib/puppet/rails.rb | |
| parent | 631552c58c9658780d0618c6b2fdfdc5a95465ea (diff) | |
| download | puppet-fc2904955ca6e77bda8719671df200e0811c38cd.tar.gz puppet-fc2904955ca6e77bda8719671df200e0811c38cd.tar.xz puppet-fc2904955ca6e77bda8719671df200e0811c38cd.zip | |
feature #2276 Single Executable: use new names for settings sections
The puppet-internal settings sections aren't actually exposed to the
user, but to reduce confusion I've renamed them to be consistent with
the single-executable application names.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
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()) |