(PUP-10853) Remove usage of legacy networking facts

GabrielNagy · GabrielNagy · commit 4328a2fccf50 · 2021-02-18T18:15:07.000+02:00
Use structured facts instead of legacy networking facts. The following
mapping applies:

fqdn =&gt; networking.fqdn
domain =&gt; networking.domain
hostname =&gt; networking.hostname
ipaddress =&gt; networking.ip
ipaddress6 =&gt; networking.ip6

Change `processorcount` to `processors.count`.
diff --git a/acceptance/lib/puppet/acceptance/agent_fqdn_utils.rb b/acceptance/lib/puppet/acceptance/agent_fqdn_utils.rb
@@ -7,7 +7,7 @@ module AgentFqdnUtils
       # convert from an Beaker::Host (agent) to the systems fqdn as returned by facter
       def agent_to_fqdn(agent)
         unless @@hostname_to_fqdn.has_key?(agent.hostname)
-          @@hostname_to_fqdn[agent.hostname] = on(agent, facter('fqdn')).stdout.chomp
+          @@hostname_to_fqdn[agent.hostname] = on(agent, facter('networking.fqdn')).stdout.chomp
         end
         @@hostname_to_fqdn[agent.hostname]
       end
diff --git a/acceptance/tests/catalog_with_binary_data.rb b/acceptance/tests/catalog_with_binary_data.rb
@@ -34,7 +34,7 @@
     manifest = <<-MANIFEST
       class #{test_num}(
       ) {
-        \$test_path = \$::fqdn ? #{agent_tmp_dirs}
+        \$test_path = \$facts['networking']['fqdn'] ? #{agent_tmp_dirs}
         file { '#{test_num}':
           path   => "\$test_path/#{test_num}",
           content => file('#{test_num}/binary_data'),
diff --git a/acceptance/tests/direct_puppet/supports_utf8.rb b/acceptance/tests/direct_puppet/supports_utf8.rb
@@ -34,7 +34,7 @@
 file { '#{environmentpath}/#{tmp_environment}/manifests/site.pp':
   ensure => file,
   content => '
-\$test_path = \$::fqdn ? #{tmp_file}
+\$test_path = \$facts['networking']['fqdn'] ? #{tmp_file}
 file { \$test_path:
   content => @(UTF8)
     #{file_contents}
diff --git a/acceptance/tests/loader/autoload_from_resource_type_decl.rb b/acceptance/tests/loader/autoload_from_resource_type_decl.rb
@@ -41,7 +41,7 @@ def empty_execution_log_file(host, path)
     custom_type = <<-END
     Puppet::Type.newtype(:type_tst) do
       newparam(:name, :namevar => true) do
-        fqdn = Facter.value(:fqdn)
+        fqdn = Facter.value('networking.fqdn')
         if fqdn == '#{agent_to_fqdn(master)}'
           File.open("#{execution_log[agent_to_fqdn(master)]}", 'a+') { |f| f.puts("found_type_tst: " + Time.now.to_s) }
         end
diff --git a/acceptance/tests/parser_functions/hiera_in_templates.rb b/acceptance/tests/parser_functions/hiera_in_templates.rb
@@ -100,7 +100,7 @@ def create_environment(osfamilies, tmp_dirs)
   \\$msgs = hiera_array('message')
   notify {\\$msgs:}
   class {'#{@module_name}':
-    result_dir => hiera('result_dir')[\\$::hostname],
+    result_dir => hiera('result_dir')[\\$facts['networking']['hostname']],
   }
 }
 ",
@@ -188,7 +188,7 @@ class #{@module_name} (
 file { "#{moduledir}/manifests/mod_default.pp":
   content => "
 class #{@module_name}::mod_default {
-  \\$result_dir = hiera('result_dir')[\\$::hostname]
+  \\$result_dir = hiera('result_dir')[\\$facts['networking']['hostname']]
   notify{\\"module mod_default invoked.\\\\n\\":}
   file {\\\"\\\${result_dir}/mod_default\\\":
     ensure  => 'file',
@@ -202,7 +202,7 @@ class #{@module_name}::mod_default {
 file { "#{moduledir}/manifests/mod_osfamily.pp":
   content => "
 class #{@module_name}::mod_osfamily {
-  \\$result_dir = hiera('result_dir')[\\$::hostname]
+  \\$result_dir = hiera('result_dir')[\\$facts['networking']['hostname']]
   notify{\\"module mod_osfamily invoked.\\\\n\\":}
   file {\\\"\\\${result_dir}/mod_osfamily\\\":
     ensure  => 'file',
@@ -216,7 +216,7 @@ class #{@module_name}::mod_osfamily {
 file { "#{moduledir}/manifests/mod_production.pp":
   content => "
 class #{@module_name}::mod_production {
-  \\$result_dir = hiera('result_dir')[\\$::hostname]
+  \\$result_dir = hiera('result_dir')[\\$facts['networking']['hostname']]
   notify{\\"module mod_production invoked.\\\\n\\":}
   file {\\\"\\\${result_dir}/mod_production\\\":
     ensure  => 'file',
@@ -230,7 +230,7 @@ class #{@module_name}::mod_production {
 file { "#{moduledir}/manifests/mod_fqdn.pp":
   content => "
 class #{@module_name}::mod_fqdn {
-  \\$result_dir = hiera('result_dir')[\\$::hostname]
+  \\$result_dir = hiera('result_dir')[\\$facts['networking']['hostname']]
   notify{\\"module mod_fqdn invoked.\\\\n\\":}
   file {\\\"\\\${result_dir}/mod_fqdn\\\":
     ensure  => 'file',
@@ -282,7 +282,7 @@ def find_tmp_dirs
   tmp_dirs = ""
   host_to_result_dir = {}
   agents.each do |agent|
-    h = on(agent, facter("hostname")).stdout.chomp
+    h = on(agent, facter('networking.hostname')).stdout.chomp
     t = agent.tmpdir("#{@module_name}_results")
     tmp_dirs += "  #{h}: '#{t}'\n"
     host_to_result_dir[h] = t
@@ -304,7 +304,7 @@ def find_tmp_dirs
   env_manifest = create_environment(find_osfamilies, tmp_dirs)
   apply_manifest_on(master, env_manifest, :catch_failures => true)
   agents.each do |agent|
-    resultdir = host_to_result_dir[on(agent, facter("hostname")).stdout.chomp]
+    resultdir = host_to_result_dir[on(agent, facter('networking.hostname')).stdout.chomp]
     step "Applying catalog to agent: #{agent}. result files in #{resultdir}"
     on(
       agent,
diff --git a/acceptance/tests/reports/corrective_change_new_resource.rb b/acceptance/tests/reports/corrective_change_new_resource.rb
@@ -36,7 +36,7 @@
     file { '#{environmentpath}/#{tmp_environment}/manifests/site.pp':
       ensure => file,
       content => '
-    \$test_path = \$::fqdn ? #{tmp_file}
+    \$test_path = \$facts['networking']['fqdn'] ? #{tmp_file}
     file { \$test_path:
       content => @(UTF8)
         #{file_contents}
diff --git a/acceptance/tests/reports/corrective_change_outside_puppet.rb b/acceptance/tests/reports/corrective_change_outside_puppet.rb
@@ -37,7 +37,7 @@
       file { '#{environmentpath}/#{tmp_environment}/manifests/site.pp':
         ensure => file,
         content => '
-      \$test_path = \$::fqdn ? #{tmp_file}
+      \$test_path = \$facts['networking']['fqdn'] ? #{tmp_file}
       file { \$test_path:
         content => @(UTF8)
           #{file_contents}
diff --git a/acceptance/tests/reports/corrective_change_via_puppet.rb b/acceptance/tests/reports/corrective_change_via_puppet.rb
@@ -39,7 +39,7 @@ def create_manifest_for_file_resource(file_resource, file_contents, environment_
       file { '#{environmentpath}/#{environment_name}/manifests/site.pp':
         ensure => file,
         content => '
-      \$test_path = \$::fqdn ? #{file_resource}
+      \$test_path = \$facts['networking']['fqdn'] ? #{file_resource}
       file { \$test_path:
         content => @(UTF8)
           #{file_contents}
diff --git a/acceptance/tests/resource/file/ticket_6448_file_with_utf8_source.rb b/acceptance/tests/resource/file/ticket_6448_file_with_utf8_source.rb
@@ -49,7 +49,7 @@
 
   step 'create a site.pp on master containing a unicode file resource' do
     site_pp_contents = <<-SITE_PP
-      \$test_path = \$::fqdn ? #{agent_tmp_dirs}
+      \$test_path = \$facts['networking']['fqdn'] ? #{agent_tmp_dirs}
       file { "\$test_path/\uff72\uff67\u30d5\u30eb":
         ensure => present,
         source => "puppet:///modules/utf8_file_module/\u9759\u7684",
diff --git a/acceptance/tests/ssl/certificate_extensions.rb b/acceptance/tests/ssl/certificate_extensions.rb
@@ -11,29 +11,29 @@
   initialize_temp_dirs
 
   agent_certnames = []
-  hostname = master.execute('facter hostname')
-  fqdn = master.execute('facter fqdn')
+  hostname = master.execute('facter networking.hostname')
+  fqdn = master.execute('facter networking.fqdn')
 
   teardown do
     step "Cleanup the test agent certs"
-    master_config = {
+    server_config = {
       'main' => { 'server' => fqdn },
-      'master' => { 'dns_alt_names' => "puppet,#{hostname},#{fqdn}" }
+      'server' => { 'dns_alt_names' => "puppet,#{hostname},#{fqdn}" }
     }
 
-    with_puppet_running_on(master, master_config) do
+    with_puppet_running_on(master, server_config) do
       on(master,
          "puppetserver ca clean --certname #{agent_certnames.join(',')}",
          :acceptable_exit_codes => [0,24])
     end
   end
 
   environments_dir = get_test_file_path(master, "environments")
-  master_config = {
+  server_config = {
     'main' => {
       'environmentpath' => environments_dir,
     },
-    'master' => {
+    'server' => {
       'autosign' => true,
       'dns_alt_names' => "puppet,#{hostname},#{fqdn}",
     }
@@ -74,7 +74,7 @@
     }
   MANIFEST
 
-  with_puppet_running_on(master, master_config) do
+  with_puppet_running_on(master, server_config) do
     agents.each do |agent|
       next if agent == master
 
diff --git a/acceptance/tests/windows/QA-506_windows_exit_codes_test.rb b/acceptance/tests/windows/QA-506_windows_exit_codes_test.rb
@@ -58,7 +58,7 @@
   native_modules_path = on(agent, puppet("config print #{module_path_config_property}")).stdout.gsub('C:', '/cygdrive/c').strip
 
   #Check to see if we are running on Windows 2003. Do a crazy hack to get around SCP issues.
-  if (on(agent, facter("find os.release.major")).stdout =~ /2003/)
+  if (on(agent, facter("os.release.major")).stdout =~ /2003/)
     on(agent, "ln -s #{native_modules_path.gsub(/ /, '\ ')} /tmp/puppet_etc")
     modules_path = '/tmp/puppet_etc'
   else
diff --git a/install.rb b/install.rb
@@ -45,7 +45,7 @@
 end
 
 PREREQS = %w{openssl facter cgi hiera}
-MIN_FACTER_VERSION = 1.5
+MIN_FACTER_VERSION = 4.0
 
 InstallOptions = OpenStruct.new
 
diff --git a/lib/puppet/file_serving/mount/file.rb b/lib/puppet/file_serving/mount/file.rb
@@ -3,12 +3,12 @@
 class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def self.localmap
     @localmap ||= {
-      "h" => Facter.value("hostname"),
+      "h" => Facter.value('networking.hostname'),
       "H" => [
-               Facter.value("hostname"),
-               Facter.value("domain")
+               Facter.value('networking.hostname'),
+               Facter.value('networking.domain')
              ].join("."),
-      "d" => Facter.value("domain")
+      "d" => Facter.value('networking.domain')
     }
   end
 
diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb
@@ -410,9 +410,9 @@ def set_server_facts
     @server_facts["serverversion"] = Puppet.version.to_s
 
     # And then add the server name and IP
-    {"servername" => "fqdn",
-      "serverip"  => "ipaddress",
-      "serverip6" => "ipaddress6"
+    {"servername" => "networking.fqdn",
+     "serverip"   => "networking.ip",
+     "serverip6"  => "networking.ip6"
     }.each do |var, fact|
       value = Facter.value(fact)
       if !value.nil?
@@ -421,10 +421,10 @@ def set_server_facts
     end
 
     if @server_facts["servername"].nil?
-      host = Facter.value(:hostname)
+      host = Facter.value('networking.hostname')
       if host.nil?
         Puppet.warning _("Could not retrieve fact servername")
-      elsif domain = Facter.value(:domain) #rubocop:disable Lint/AssignmentInCondition
+      elsif (domain = Facter.value('networking.domain'))
         @server_facts["servername"] = [host, domain].join(".")
       else
         @server_facts["servername"] = host
diff --git a/lib/puppet/settings.rb b/lib/puppet/settings.rb
@@ -66,7 +66,7 @@ def self.app_defaults_for_run_mode(run_mode)
     }
   end
 
-  def self.default_certname()
+  def self.default_certname
     hostname = hostname_fact
     domain = domain_fact
     if domain and domain != ""
@@ -77,12 +77,12 @@ def self.default_certname()
     fqdn.to_s.gsub(/\.$/, '')
   end
 
-  def self.hostname_fact()
-    Facter.value :hostname
+  def self.hostname_fact
+    Facter.value('networking.hostname')
   end
 
-  def self.domain_fact()
-    Facter.value :domain
+  def self.domain_fact
+    Facter.value('networking.domain')
   end
 
   def self.default_config_file_name
diff --git a/spec/unit/file_serving/mount/file_spec.rb b/spec/unit/file_serving/mount/file_spec.rb
@@ -3,8 +3,8 @@
 
 module FileServingMountTesting
   def stub_facter(hostname)
-    allow(Facter).to receive(:value).with("hostname").and_return(hostname.sub(/\..+/, ''))
-    allow(Facter).to receive(:value).with("domain").and_return(hostname.sub(/^[^.]+\./, ''))
+    allow(Facter).to receive(:value).with('networking.hostname').and_return(hostname.sub(/\..+/, ''))
+    allow(Facter).to receive(:value).with('networking.domain').and_return(hostname.sub(/^[^.]+\./, ''))
   end
 end
 
diff --git a/spec/unit/indirector/catalog/compiler_spec.rb b/spec/unit/indirector/catalog/compiler_spec.rb
@@ -389,10 +389,10 @@ def a_request_that_contains(facts)
     before do
       allow(Puppet).to receive(:version).and_return(1)
       set_facts({
-        'fqdn'       => "my.server.com",
-        'ipaddress'  => "my.ip.address",
-        'ipaddress6' => nil
-        })
+        'networking.fqdn' => "my.server.com",
+        'networking.ip'   => "my.ip.address",
+        'networking.ip6'  => nil
+      })
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
       allow(compiler).to receive(:compile)
       allow(Puppet::Node.indirection).to receive(:find).with(node_name, anything).and_return(node)
@@ -424,16 +424,16 @@ def a_request_that_contains(facts)
     before do |example|
       allow(Puppet).to receive(:version).and_return(1)
       set_facts({
-        'fqdn'       => "my.server.com",
-        'ipaddress'  => nil,
+        'networking.fqdn' => "my.server.com",
+        'networking.ip'   => nil,
       })
       if example.metadata[:nil_ipv6]
         set_facts({
-          'ipaddress6' => nil
+          'networking.ip6' => nil
         })
       else
         set_facts({
-          'ipaddress6' => "my.ipv6.address"
+          'networking.ip6' => "my.ipv6.address"
         })
       end
       @request = Puppet::Indirector::Request.new(:catalog, :find, node_name, nil)
diff --git a/tasks/parallel.rake b/tasks/parallel.rake
@@ -401,7 +401,7 @@ else
       # Default group size in rspec examples
       DEFAULT_GROUP_SIZE = 1000
 
-      process_count = [(args[:process_count] || Facter.value("processorcount")).to_i, 1].max
+      process_count = [(args[:process_count] || Facter.value('processors.count')).to_i, 1].max
       group_size = [(args[:group_size] || DEFAULT_GROUP_SIZE).to_i, 1].max
 
       abort unless Parallel::RSpec::Parallelizer.new(process_count, group_size, color_output?, args.extras).run
