Merge pull request #1110 from lsst-it/IT-5219/enc-to-puppetdb

(profile::core::node_info) fwv

site/profile/manifests/core/common.pp

@@ -75,6 +75,7 @@
   include profile::core::kernel
   include profile::core::keytab
   include profile::core::nm_dispatch
+  include profile::core::node_info
   include profile::core::selinux
   include profile::core::systemd
   include rsyslog

site/profile/manifests/core/node_info.pp

@@ -0,0 +1,22 @@
+# @summary
+#   This empty class exists solely as a vehicle for shipping enc data to puppetdb.
+#
+#   Note that the facts hash does not contain enc parameters and they must be
+#   accessed as top scoped variables.
+#
+# @param site
+# @param role
+# @param cluster
+# @param variant
+# @param subvariant
+#
+# lint:ignore:top_scope_facts
+class profile::core::node_info (
+  Optional[String[1]] $site = $::site,
+  Optional[String[1]] $role = $::role,
+  Optional[String[1]] $cluster = $::cluster,
+  Optional[String[1]] $variant = $::variant,
+  Optional[String[1]] $subvariant = $::subvariant,
+) {
+# lint:endignore
+}

spec/classes/ccs/common_spec.rb

@@ -5,7 +5,8 @@
 describe 'profile::ccs::common' do
   on_supported_os.each do |os, os_facts|
     context "on #{os}" do
-      let(:facts) { override_facts(os_facts, site: 'ls') }
+      let(:facts) { os_facts }
+      let(:node_params) { { site: 'ls' } }
       let(:pre_condition) do
         <<~PP
           include ssh

spec/classes/ccs/el9_spec.rb

@@ -7,7 +7,8 @@
     next unless os =~ %r{almalinux-9-x86_64}
 
     context "on #{os}" do
-      let(:facts) { override_facts(os_facts, site: 'ls') }
+      let(:facts) { os_facts }
+      let(:node_params) { { site: 'ls' } }
       let(:pre_condition) do
         <<~PP
           include ssh

spec/spec_helper.rb

@@ -105,6 +105,14 @@ def hiera_files_in_layer(layer)
     Puppet.settings[:strict] = :warning
   end
   c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
+  # stub out enc parameters which will show up as top level variables, if set.
+  c.default_node_params = {
+    role: nil,
+    site: nil,
+    cluster: nil,
+    variant: nil,
+    subvariant: nil,
+  }
 end
 
 # Disable rspec-puppet coverage reporting which is hardwired as enabled here:
@@ -419,6 +427,18 @@ def node_files
 
   it { is_expected.to contain_class('systemd').with_manage_udevd(true) }
   it { is_expected.to contain_class('sudo').with_purge(true) }
+
+  # All host spec are expected to set the role & site node params. The other
+  # node params will vary per host spec.
+  it do
+    is_expected.to contain_class('profile::core::node_info').with(
+      role: node_params[:role],
+      site: node_params[:site],
+      cluster: node_params[:cluster],
+      variant: node_params[:variant],
+      subvariant: node_params[:subvariant],
+    )
+  end
 end
 
 shared_examples 'lhn sysctls', :lhn_node do