From fefcf7bbec781c5c5a0ed87b5def8a04d583b2f8 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Thu, 4 Aug 2022 08:48:49 +0000 Subject: [PATCH] feat(infra): Migrate ARM nomad to Jammy Signed-off-by: Peter Mikus Change-Id: I600d5ecc725f8e82219feed2abcdeaa43e78a30b --- docs/lab/fdio-dc-physical.md | 4 ++-- docs/lab/fdio-dc-physical.yaml | 4 ++-- .../lf_inventory/host_vars/10.30.51.91.yaml | 22 +++++++++++----------- .../lf_inventory/host_vars/10.30.51.92.yaml | 22 +++++++++++----------- fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf | 4 ++-- .../tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f | 6 +++--- .../tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb | 6 +++--- .../d8:5e:d3:02:b1:9f/meta-data | 0 .../d8:5e:d3:02:b1:9f/user-data | 2 +- .../d8:5e:d3:02:b1:bb/meta-data | 0 .../d8:5e:d3:02:b1:bb/user-data | 2 +- 11 files changed, 36 insertions(+), 36 deletions(-) rename fdio.infra.pxe/docker-nginx/html/{ubuntu_focal_arm64 => ubuntu_jammy_arm64}/d8:5e:d3:02:b1:9f/meta-data (100%) rename fdio.infra.pxe/docker-nginx/html/{ubuntu_focal_arm64 => ubuntu_jammy_arm64}/d8:5e:d3:02:b1:9f/user-data (98%) rename fdio.infra.pxe/docker-nginx/html/{ubuntu_focal_arm64 => ubuntu_jammy_arm64}/d8:5e:d3:02:b1:bb/meta-data (100%) rename fdio.infra.pxe/docker-nginx/html/{ubuntu_focal_arm64 => ubuntu_jammy_arm64}/d8:5e:d3:02:b1:bb/user-data (98%) diff --git a/docs/lab/fdio-dc-physical.md b/docs/lab/fdio-dc-physical.md index d45a2fef83..8ac9c2c24c 100644 --- a/docs/lab/fdio-dc-physical.md +++ b/docs/lab/fdio-dc-physical.md @@ -115,8 +115,8 @@ s31-t35-sut2/dnv3,up,t35,3n-dnv,SYS-E300-9A,CE300AG39040898,10.32.8.13,10.30.55. s30-t35-sut1/dnv2,up,t35,3n-dnv,SYS-E300-9A,CE300AG39040866,10.32.8.12,10.30.55.12,3016.12,u44 s29-t26-sut1/dnv1,up,t26,2n-dnv,SYS-E300-9A,CE300AG39040897,10.32.8.11,10.30.55.11,3016.12,u43 s28-t26t35-tg1,up,t26t35,2n/3n-dnv,SYS-7049GP-TRT,C7470KH06A20137,10.32.8.10,10.30.55.10,3016.12,u39-u42 -s58-nomad,up,nomad-cluster1,nomad-client,R152-P30-00,GLG4P9912A0016,10.30.51.91,10.30.50.91,3016.12,u36 -s59-nomad,up,nomad-cluster1,nomad-client,R152-P30-00,GLG4P9912A0004,10.30.51.92,10.30.50.92,3016.12,u35 +s91-nomad,up,nomad-cluster1,nomad-client,R152-P30-00,GLG4P9912A0016,10.30.51.91,10.30.50.91,3016.12,u36 +s92-nomad,up,nomad-cluster1,nomad-client,R152-P30-00,GLG4P9912A0004,10.30.51.92,10.30.50.92,3016.12,u35 s23-nomad,up,nomad-cluster1,nomad-server,SYS-1029P-WTRT,C1160LI12NM0256,10.30.51.23,10.30.51.23,3016.12,u34 s24-nomad,up,nomad-cluster1,nomad-server,SYS-1029P-WTRT,C1160LI12NM0241,10.30.51.24,10.30.51.24,3016.12,u33 s25-nomad,up,nomad-cluster1,nomad-server,SYS-1029P-WTRT,C1160LI12NM0540,10.30.51.25,10.30.51.25,3016.12,u32 diff --git a/docs/lab/fdio-dc-physical.yaml b/docs/lab/fdio-dc-physical.yaml index 0d8d386d94..583498378c 100644 --- a/docs/lab/fdio-dc-physical.yaml +++ b/docs/lab/fdio-dc-physical.yaml @@ -467,14 +467,14 @@ yul1: mgmt_ip4: 10.32.8.10 lom_ip4: 10.30.55.10 - unit: 36 - name: s58-nomad + name: s91-nomad oper_status: device_type: R152-P30-00 serial_number: GLG4P9912A0016 mgmt_ip4: 10.30.51.91 lom_ip4: 10.30.50.91 - unit: 35 - name: s59-nomad + name: s92-nomad oper_status: device_type: R152-P30-00 serial_number: GLG4P9912A0004 diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml index acec687e8b..d06284d5a4 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.91.yaml @@ -1,7 +1,7 @@ --- # file: host_vars/10.30.51.91.yaml -hostname: "s58-nomad" +hostname: "s91-nomad" inventory_ipmi_hostname: "10.30.50.91" cpu_microarchitecture: "neoversen1" @@ -38,13 +38,13 @@ nomad_options: driver.whitelist: "docker,raw_exec,exec" nomad_service_mgr: "systemd" nomad_retry_servers: - - "10.32.8.15" - - "10.32.8.16" - - "10.32.8.17" + - "10.30.51.23" + - "10.30.51.24" + - "10.30.51.25" nomad_servers: - - "10.32.8.15:4647" - - "10.32.8.16:4647" - - "10.32.8.17:4647" + - "10.30.51.23:4647" + - "10.30.51.24:4647" + - "10.30.51.25:4647" # Consul settings. consul_nomad_integration: true @@ -56,11 +56,11 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ hostname }}" consul_node_role: "client" consul_retry_servers: - - "10.32.8.15" - - "10.32.8.16" - - "10.32.8.17" + - "10.30.51.23" + - "10.30.51.24" + - "10.30.51.25" consul_service_mgr: "systemd" -consul_package_version: "1.5.2+dfsg2-14" +#consul_package_version: "1.5.2+dfsg2-14" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml index 0ddb47fbcd..705409fb6b 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.92.yaml @@ -1,7 +1,7 @@ --- # file: host_vars/10.30.51.92.yaml -hostname: "s59-nomad" +hostname: "s92-nomad" inventory_ipmi_hostname: "10.30.50.92" cpu_microarchitecture: "neoversen1" @@ -38,13 +38,13 @@ nomad_options: driver.whitelist: "docker,raw_exec,exec" nomad_service_mgr: "systemd" nomad_retry_servers: - - "10.32.8.15" - - "10.32.8.16" - - "10.32.8.17" + - "10.30.51.23" + - "10.30.51.24" + - "10.30.51.25" nomad_servers: - - "10.32.8.15:4647" - - "10.32.8.16:4647" - - "10.32.8.17:4647" + - "10.30.51.23:4647" + - "10.30.51.24:4647" + - "10.30.51.25:4647" # Consul settings. consul_nomad_integration: true @@ -56,11 +56,11 @@ consul_encrypt: "Y4T+5JGx1C3l2NFBBvkTWQ==" consul_node_name: "{{ hostname }}" consul_node_role: "client" consul_retry_servers: - - "10.32.8.15" - - "10.32.8.16" - - "10.32.8.17" + - "10.30.51.23" + - "10.30.51.24" + - "10.30.51.25" consul_service_mgr: "systemd" -consul_package_version: "1.5.2+dfsg2-14" +#consul_package_version: "1.5.2+dfsg2-14" # Docker daemon settings. docker_daemon: diff --git a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf index 6918b76b81..23b7285612 100755 --- a/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra.pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -89,8 +89,8 @@ dhcp-host=3c:ec:ef:bc:92:e4,10.30.51.86,s86-t214-tg1,infinite # eno1 dhcp-host=3c:ec:ef:bc:92:e8,10.30.51.87,s87-t215-sut1,infinite # eno1 dhcp-host=3c:ec:ef:bc:a1:ac,10.30.51.88,s88-t215-tg1,infinite # eno1 dhcp-host=3c:ec:ef:b9:cc:44,10.30.51.89,s89-t39t310-tg1,infinite # eno1 -dhcp-host=d8:5e:d3:02:b1:bb,10.30.51.91,s58-nomad,infinite #eno1 -dhcp-host=d8:5e:d3:02:b1:9f,10.30.51.92,s59-nomad,infinite #eno1 +dhcp-host=d8:5e:d3:02:b1:bb,10.30.51.91,s91-nomad,infinite #eno1 +dhcp-host=d8:5e:d3:02:b1:9f,10.30.51.92,s92-nomad,infinite #eno1 dhcp-host=a4:bf:01:55:ac:39,10.30.51.93,s93-t39-sut1,infinite # enp4s0 dhcp-host=a4:bf:01:55:af:5e,10.30.51.94,s94-t39-sut2,infinite # enp4s0 diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f index 1bb3bffccb..9c17102ad2 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:9f @@ -1,4 +1,4 @@ -menuentry "Install s59-nomad" { - linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:9f url=http://10.30.51.20:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_focal_arm64/d8:5e:d3:02:b1:9f/ --- console=ttyAMA0,115200n8 quiet - initrd /casper/ubuntu-focal-arm64/initrd +menuentry "Install s92-nomad" { + linux /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:9f url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/ --- console=ttyAMA0,115200n8 quiet + initrd /casper/ubuntu-jammy-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb index 31a3629767..814b717899 100644 --- a/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb +++ b/fdio.infra.pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-d8:5e:d3:02:b1:bb @@ -1,4 +1,4 @@ -menuentry "Install s58-nomad" { - linux /casper/ubuntu-focal-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:bb url=http://10.30.51.20:8081/ubuntu_focal_arm64/ubuntu-20.04.4-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_focal_arm64/d8:5e:d3:02:b1:bb/ --- console=ttyAMA0,115200n8 quiet - initrd /casper/ubuntu-focal-arm64/initrd +menuentry "Install s91-nomad" { + linux /casper/ubuntu-jammy-arm64/vmlinuz ip=dhcp interface=d8:5e:d3:02:b1:bb url=http://10.30.51.20:8081/ubuntu_jammy_arm64/ubuntu-22.04-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.20:8081/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/ --- console=ttyAMA0,115200n8 quiet + initrd /casper/ubuntu-jammy-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:9f/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/meta-data similarity index 100% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:9f/meta-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/meta-data diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:9f/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/user-data similarity index 98% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:9f/user-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/user-data index 812040c43d..42de9bb956 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:9f/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:9f/user-data @@ -10,7 +10,7 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s59-nomad + hostname: s92-nomad password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 realname: localadmin username: localadmin diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:bb/meta-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/meta-data similarity index 100% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:bb/meta-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/meta-data diff --git a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:bb/user-data b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/user-data similarity index 98% rename from fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:bb/user-data rename to fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/user-data index e59c293a8b..3418e78c32 100644 --- a/fdio.infra.pxe/docker-nginx/html/ubuntu_focal_arm64/d8:5e:d3:02:b1:bb/user-data +++ b/fdio.infra.pxe/docker-nginx/html/ubuntu_jammy_arm64/d8:5e:d3:02:b1:bb/user-data @@ -10,7 +10,7 @@ autoinstall: - arches: [default] uri: http://ports.ubuntu.com/ubuntu-ports identity: - hostname: s58-nomad + hostname: s91-nomad password: $6$FIsbVDQR$5D0wgufOd2FtnmOiRNsGlgg6Loh.0x3dWSj72DSQnqisSyE9DROfgSgA6s0yxDwz4Jd5SRTXiTKuRYuSQ5POI1 realname: localadmin username: localadmin -- 2.16.6