Merge pull request #959 from lsst-it/IT-4713/hosts

(Puppetfile) replace ghoneycutt/hosts with puppet/hosts

Puppetfile

@@ -23,7 +23,6 @@ mod 'lsst/daq', '2.2.0'
 mod 'lsst/dellperc', '2.0.0'
 mod 'lsst/foreman_envsync', '2.1.0'
 mod 'lsst/helm_binary', '2.1.0'
-mod 'lsst/hosts', git: 'https://github.com/lsst-it/puppet-module-hosts', ref: '528475e' # Fork of ghoneycutt/hosts that includes https://github.com/ghoneycutt/puppet-module-hosts/pull/63
 mod 'lsst/java_artisanal', '3.3.0'
 mod 'lsst/kubectl', '1.1.0'
 mod 'lsst/maven', '3.1.0'
@@ -41,6 +40,7 @@ mod 'puppet/epel', '4.1.0'
 mod 'puppet/extlib', '6.2.0'
 mod 'puppetfinland/easy_ipa', git: 'https://github.com/lsst-it/puppet-ipa', ref: 'e349cd3'  # https://github.com/Puppet-Finland/puppet-ipa/pull/32
 mod 'puppet/firewalld', '4.5.1'
+mod 'puppet/hosts', git: 'https://github.com/voxpupuli/puppet-hosts', ref: 'v0.1.0'
 mod 'puppet/ipset', '3.0.0'
 mod 'puppet/kmod', '3.2.0'
 mod 'puppetlabs/accounts', '7.1.1'

hieradata/cluster/auxtel-ccs.yaml

@@ -135,5 +135,3 @@ ccs_sal::rpms:
 
 daq::daqsdk::purge: false
 daq::daqsdk::version: "R5-V6.7"
-
-hosts::stored_config: false

hieradata/cluster/comcam-ccs.yaml

@@ -113,5 +113,3 @@ ccs_software::installations:
 daq::daqsdk::purge: false
 
 daq::daqsdk::version: "R5-V6.7"
-
-hosts::stored_config: false

hieradata/cluster/lsstcam-ccs.yaml

@@ -112,5 +112,3 @@ ccs_software::installations:
 daq::daqsdk::purge: false
 
 daq::daqsdk::version: "R5-V6.7"
-
-hosts::stored_config: false

hieradata/common.yaml

@@ -86,7 +86,6 @@ lookup_options:
     merge:
       strategy: "deep"
 
-hosts::purge_hosts: true
 timezone::timezone: "UTC"
 chrony::cmdport: 0
 chrony::leapsecmode: "system"

hieradata/node/auxtel-daq-mgt.cp.lsst.org.yaml

@@ -36,8 +36,8 @@ network::interfaces_hash:
     onboot: "no"
     type: "Ethernet"
 
-hosts::host_entries:
-  "auxtel-sm":
+hosts::entries:
+  auxtel-sm:
     ip: "192.168.101.2"
 
 nfs::server_enabled: true

hieradata/node/comcam-daq-mgt.cp.lsst.org.yaml

@@ -26,8 +26,8 @@ network::interfaces_hash:
     onboot: "no"
     type: "Ethernet"
 
-hosts::host_entries:
-  "comcam-sm":
+hosts::entries:
+  comcam-sm:
     ip: "10.0.0.212"
 
 nfs::server_enabled: true

hieradata/node/daq-mgt.tu.lsst.org.yaml

@@ -30,8 +30,8 @@ network::interfaces_hash:
   p2p2:
     <<: *not_connected
 
-hosts::host_entries:
-  "tts-sm":
+hosts::entries:
+  tts-sm:
     ip: "10.0.0.212"
 
 nfs::server_enabled: true

hieradata/role/ipareplica.yaml

@@ -46,7 +46,7 @@ tailscale::up_options:
   accept-dns: false  # leave /etc/resolv.conf alone
   hostname: "%{facts.fqdn}"  # use fqdn instead of short hostname
 
-hosts::host_entries:
+hosts::entries:
   ipa1.dev.lsst.org:
     ip: "100.76.95.74"
   ipa2.dev.lsst.org:

spec/hosts/nodes/auxtel-daq-mgt-cp.lsst.org_spec.rb

@@ -33,18 +33,9 @@
 
       it { is_expected.to contain_class('daq::daqsdk').with_version('R5-V6.7') }
       it { is_expected.to contain_class('daq::rptsdk').with_version('V3.5.3') }
+      it { is_expected.to contain_host('auxtel-sm').with_ip('192.168.101.2') }
       it { is_expected.to contain_network__interface('p3p1').with_ensure('absent') }
 
-      it do
-        is_expected.to contain_class('hosts').with(
-          host_entries: {
-            'auxtel-sm' => {
-              'ip' => '192.168.101.2',
-            },
-          },
-        )
-      end
-
       it do
         is_expected.to contain_network__interface('em2').with(
           bootproto: 'none',

spec/hosts/nodes/comcam-daq-mgt-cp.lsst.org_spec.rb

@@ -33,18 +33,9 @@
 
       it { is_expected.to contain_class('daq::daqsdk').with_version('R5-V6.7') }
       it { is_expected.to contain_class('daq::rptsdk').with_version('V3.5.3') }
+      it { is_expected.to contain_host('comcam-sm').with_ip('10.0.0.212') }
       it { is_expected.to contain_network__interface('p2p1').with_ensure('absent') }
 
-      it do
-        is_expected.to contain_class('hosts').with(
-          host_entries: {
-            'comcam-sm' => {
-              'ip' => '10.0.0.212',
-            },
-          },
-        )
-      end
-
       it do
         is_expected.to contain_network__interface('em2').with(
           bootproto: 'none',

spec/hosts/nodes/daq-mgt.tu.lsst.org_spec.rb

@@ -33,18 +33,9 @@
 
       it { is_expected.to contain_class('daq::daqsdk').with_version('R5-V6.7') }
       it { is_expected.to contain_class('daq::rptsdk').with_version('V3.5.3') }
+      it { is_expected.to contain_host('tts-sm').with_ip('10.0.0.212') }
       it { is_expected.to contain_network__interface('p2p1').with_ensure('absent') }
 
-      it do
-        is_expected.to contain_class('hosts').with(
-          host_entries: {
-            'tts-sm' => {
-              'ip' => '10.0.0.212',
-            },
-          },
-        )
-      end
-
       it do
         is_expected.to contain_network__interface('em4').with(
           bootproto: 'none',