(node/dns3.ls.lsst.org) convert net config to EL9

lsst-it · Oct 18, 2023 · 5d4e34b · 5d4e34b
1 parent 5e069e1
commit 5d4e34b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 23 deletions.
diff --git a/hieradata/node/dns3.ls.lsst.org.yaml b/hieradata/node/dns3.ls.lsst.org.yaml
@@ -1,22 +1,18 @@
 ---
 nm::connections:
-  ens3:
-    content: |
-      [connection]
-      id=ens3
-      uuid=21d47e65-8523-1a06-af22-6f121086f085
-      type=ethernet
-      interface-name=ens3
-
-      [ethernet]
-
-      [ipv4]
-      address1=139.229.135.55/24,139.229.135.254
-      dns=139.229.135.53;139.229.135.54;139.229.135.55;
-      dns-search=ls.lsst.org;
-      method=manual
-
-      [ipv6]
-      method=ignore
-
-      [proxy]
+  enp1s0:
+    content:
+      connection:
+        id: "enp1s0"
+        uuid: "21d47e65-8523-1a06-af22-6f121086f085"
+        type: "ethernet"
+        interface-name: "enp1s0"
+      ethernet: {}
+      ipv4:
+        address1: "139.229.135.55/24,139.229.135.254"
+        dns: "139.229.135.53;139.229.135.54;139.229.135.55;"
+        dns-search: "ls.lsst.org;"
+        method: "manual"
+      ipv6:
+        method: "ignore"
+      proxy: {}
diff --git a/spec/hosts/nodes/dns3.ls.lsst.org_spec.rb b/spec/hosts/nodes/dns3.ls.lsst.org_spec.rb
@@ -4,7 +4,7 @@
 
 describe 'dns3.ls.lsst.org', :sitepp do
   on_supported_os.each do |os, facts|
-    next if os =~ %r{centos-7-x86_64}
+    next unless os =~ %r{almalinux-9-x86_64}
 
     context "on #{os}" do
       let(:facts) do
@@ -31,8 +31,8 @@
       include_context 'with nm interface'
       it { is_expected.to have_nm__connection_resource_count(1) }
 
-      context 'with ens3' do
-        let(:interface) { 'ens3' }
+      context 'with enp1s0' do
+        let(:interface) { 'enp1s0' }
 
         it_behaves_like 'nm enabled interface'
         it_behaves_like 'nm ethernet interface'