Skip to content

Commit

Permalink
Merge pull request #1204 from lsst-it/IT-5425_lsstcam_fb02_el9
Browse files Browse the repository at this point in the history
(node/lsstcam-fb02.cp) provision host as EL9
  • Loading branch information
dtapiacl authored Jun 11, 2024
2 parents 2a7355d + 9a06181 commit 557b8d2
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Puppetfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mod 'jcpunk/irqbalance', '1.0.5'
mod 'jhoblitt/ipmi', '5.2.0'
mod 'lsst/ccs_daq', '1.1.0'
mod 'lsst/ccs_database', '3.1.0'
mod 'lsst/ccs_hcu', '3.3.1'
mod 'lsst/ccs_hcu', '3.4.1'
mod 'lsst/ccs_monit', '2.2.2'
mod 'lsst/ccs_sal', '2.4.0'
mod 'lsst/ccs_software', '2.2.2'
Expand Down
34 changes: 34 additions & 0 deletions hieradata/node/lsstcam-fb02.cp.lsst.org.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
nm::connections:
enp0s31f6:
content:
connection:
id: "enp0s31f6"
uuid: "03da7500-2101-c722-2438-d0d006c28c73"
type: "ethernet"
interface-name: "enp0s31f6"
ethernet: {}
ipv4:
address1: "139.229.175.99/26,139.229.175.126"
dns: "139.229.160.53;139.229.160.54;139.229.160.55;"
dns-search: "cp.lsst.org;"
method: "manual"
ipv6:
method: "disabled"
proxy: {}
enp3s0:
content:
connection:
id: "enp3s0"
uuid: "de9904c8-9577-1a17-36b1-34b94132f06a"
type: "ethernet"
autoconnect: "false"
interface-name: "enp3s0"
ethernet: {}
ipv4:
method: "disabled"
ipv6:
method: "disabled"

ccs_hcu::canbus: true
ccs_hcu::aiousb: true
3 changes: 3 additions & 0 deletions hieradata/role/ccs-hcu/osfamily/RedHat/major/9.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
ccs_hcu::canbus::module: "advSocketCAN"
ccs_hcu::canbus::version: "3.0.2.2"
58 changes: 58 additions & 0 deletions spec/hosts/nodes/lsstcam-fb02.cp.lsst.org_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# frozen_string_literal: true

require 'spec_helper'

describe 'lsstcam-fb02.cp.lsst.org', :sitepp do
on_supported_os.each do |os, os_facts|
next unless os =~ %r{almalinux-9-x86_64}

context "on #{os}" do
let(:facts) do
override_facts(os_facts,
fqdn: 'lsstcam-fb02.cp.lsst.org',
is_virtual: false,
virtual: 'physical',
dmi: {
'product' => {
'name' => 'VersaLogic Corporation',
},
})
end
let(:node_params) do
{
role: 'ccs-hcu',
site: 'cp',
cluster: 'lsstcam-ccs',
}
end

it { is_expected.to compile.with_all_deps }

include_examples 'baremetal no bmc'
include_context 'with nm interface'

it { is_expected.to have_nm__connection_resource_count(2) }

%w[
enp3s0
].each do |i|
context "with #{i}" do
let(:interface) { i }

it_behaves_like 'nm disabled interface'
end
end

context 'with enp0s31f6' do
let(:interface) { 'enp0s31f6' }

it_behaves_like 'nm enabled interface'
it_behaves_like 'nm ethernet interface'
it_behaves_like 'nm manual interface'
it { expect(nm_keyfile['ipv4']['address1']).to eq('139.229.175.99/26,139.229.175.126') }
it { expect(nm_keyfile['ipv4']['dns']).to eq('139.229.160.53;139.229.160.54;139.229.160.55;') }
it { expect(nm_keyfile['ipv4']['dns-search']).to eq('cp.lsst.org;') }
end
end # on os
end # on_supported_os
end

0 comments on commit 557b8d2

Please sign in to comment.