Merge pull request puppetlabs#3232 from whopper/pup-3289/removal/cat_…

…format-dynfacts

(PUP-3289) Remove deprecated catalog_format and dynamicfacts settings

lib/puppet/defaults.rb

@@ -1357,18 +1357,6 @@ def self.default_diffargs
       :default    => "$masterport",
       :desc       => "The port to use for the certificate authority.",
     },
-    :catalog_format => {
-      :default => "",
-      :desc => "(Deprecated for 'preferred_serialization_format') What format to
-        use to dump the catalog.  Only supports 'marshal' and 'yaml'.  Only
-        matters on the client, since it asks the server for a specific format.",
-      :hook => proc { |value|
-        if value
-          Puppet.deprecation_warning "Setting 'catalog_format' is deprecated; use 'preferred_serialization_format' instead."
-          Puppet.settings.override_default(:preferred_serialization_format, value)
-        end
-      }
-    },
     :preferred_serialization_format => {
       :default    => "pson",
       :desc       => "The preferred means of serializing
@@ -1449,17 +1437,6 @@ def self.default_diffargs
         fact be stale even if the timestamps are up to date - if the facts
         change or if the server changes.",
     },
-    :dynamicfacts => {
-      :default    => "memorysize,memoryfree,swapsize,swapfree",
-      :desc       => "(Deprecated) Facts that are dynamic; these facts will be ignored when deciding whether
-        changed facts should result in a recompile.  Multiple facts should be
-        comma-separated.",
-      :hook => proc { |value|
-        if value
-          Puppet.deprecation_warning "The dynamicfacts setting is deprecated and will be ignored."
-        end
-      }
-    },
     :splaylimit => {
       :default    => "$runinterval",
       :type       => :duration,

man/man5/puppet.conf.5

@@ -272,9 +272,6 @@ How to store cached catalogs\. Valid values are \'json\', \'msgpack\' and \'yaml
 .TP
 \fIDefault\fR:
 
-.
-.SS "catalog_format"
-(Deprecated for \'preferred_serialization_format\') What format to use to dump the catalog\. Only supports \'marshal\' and \'yaml\'\. Only matters on the client, since it asks the server for a specific format\.
 .
 .SS "catalog_terminus"
 Where to get node catalogs\. This is useful to change if, for instance, you\'d like to pre\-compile catalogs and store them in memcached or some other easily\-accessed store\.
@@ -669,14 +666,6 @@ Whether to document all resources when using \fBpuppet doc\fR to generate manife
 .
 .IP "" 0
 .
-.SS "dynamicfacts"
-(Deprecated) Facts that are dynamic; these facts will be ignored when deciding whether changed facts should result in a recompile\. Multiple facts should be comma\-separated\.
-.
-.IP "\(bu" 4
-\fIDefault\fR: memorysize,memoryfree,swapsize,swapfree
-.
-.IP "" 0
-.
 .SS "environment"
 The environment Puppet is running in\. For clients (e\.g\., \fBpuppet agent\fR) this determines the environment itself, which is used to find modules and much more\. For servers (i\.e\., \fBpuppet master\fR) this provides the default environment for nodes we know nothing about\.
 .

spec/integration/defaults_spec.rb

@@ -72,17 +72,6 @@
     end
   end
 
-  describe "when setting the :catalog_format" do
-    it "should log a deprecation notice" do
-      Puppet.expects(:deprecation_warning)
-      Puppet.settings[:catalog_format] = 'marshal'
-    end
-    it "should copy the value to :preferred_serialization_format" do
-      Puppet.settings[:catalog_format] = 'marshal'
-      Puppet.settings[:preferred_serialization_format].should == 'marshal'
-    end
-  end
-
   it "should have a clientyamldir setting" do
     Puppet.settings[:clientyamldir].should_not be_nil
   end