diff options
| -rw-r--r-- | lib/puppet/defaults.rb | 1 | ||||
| -rw-r--r-- | lib/puppet/transaction.rb | 4 | ||||
| -rwxr-xr-x | test/puppet/defaults.rb | 2 | ||||
| -rwxr-xr-x | test/util/metrics.rb | 5 |
4 files changed, 1 insertions, 11 deletions
diff --git a/lib/puppet/defaults.rb b/lib/puppet/defaults.rb index 4fb8bfeba..877e2b209 100644 --- a/lib/puppet/defaults.rb +++ b/lib/puppet/defaults.rb @@ -445,7 +445,6 @@ module Puppet Directories for each reporting host will be created under this directory." }, - :rrdgraph => [false, "Whether RRD information should be graphed."], :rrdinterval => ["$runinterval", "How often RRD should expect data. This should match how often the hosts report back to the server."], :strict_hostname_checking => [false, "Whether to only search for the complete diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index ea283d8bb..c0b4c0e65 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -508,10 +508,6 @@ class Transaction return end - if Puppet[:rrdgraph] == true - report.graph() - end - if Puppet[:summarize] puts report.summary end diff --git a/test/puppet/defaults.rb b/test/puppet/defaults.rb index 7befb9fa2..d53c23217 100755 --- a/test/puppet/defaults.rb +++ b/test/puppet/defaults.rb @@ -11,7 +11,7 @@ class TestPuppetDefaults < Test::Unit::TestCase @@dirs = %w{rrddir confdir vardir logdir statedir} @@files = %w{statefile manifest masterlog} @@normals = %w{puppetport masterport server} - @@booleans = %w{rrdgraph noop} + @@booleans = %w{noop} def testVersion assert( Puppet.version =~ /^[0-9]+(\.[0-9]+)*/, "got invalid version number %s" % Puppet.version ) diff --git a/test/util/metrics.rb b/test/util/metrics.rb index b3219fc1a..6dcb84119 100755 --- a/test/util/metrics.rb +++ b/test/util/metrics.rb @@ -49,11 +49,6 @@ class TestMetric < PuppetTest::TestCase } end - def setup - super - Puppet[:rrdgraph] = true - end - def test_fakedata report = Puppet::Transaction::Report.new time = Time.now.to_i |