Restore BM lab after 17-3-0 release
- change disks mapping due to changed udev rules
- add grub parameter to future SRIOV support
- change DNS server to dnsmasq located at seed node
- add loadbalancer to subnets
- add cz7756 back to server pool
- remove coredns deployment
MOSSUST-122
Change-Id: Ifbd51516eb57955e5135f904e4d0581e74ee6dd6
diff --git a/bm_mcc_mosk/child/cluster/baremetalhostprofiles.yaml b/bm_mcc_mosk/child/cluster/baremetalhostprofiles.yaml
index bd1fca9..b294c45 100644
--- a/bm_mcc_mosk/child/cluster/baremetalhostprofiles.yaml
+++ b/bm_mcc_mosk/child/cluster/baremetalhostprofiles.yaml
@@ -52,7 +52,7 @@
- 'GRUB_DISABLE_RECOVERY="true"'
- 'GRUB_PRELOAD_MODULES=lvm'
- 'GRUB_TIMEOUT=20'
- - 'GRUB_CMDLINE_LINUX="noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
+ - 'GRUB_CMDLINE_LINUX="noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0 "'
kernelParameters:
sysctl:
kernel.dmesg_restrict: "1"
@@ -81,8 +81,7 @@
spec:
devices:
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-1
+ hctl: "4:0:0:0"
minSize: 60Gi
wipeDevice:
eraseMetadata:
@@ -99,8 +98,7 @@
- name: root
size: 0
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-2
+ hctl: "5:0:0:0"
wipe: true
fileSystems:
- fileSystem: vfat
@@ -127,7 +125,7 @@
- 'GRUB_DISABLE_RECOVERY="true"'
- 'GRUB_PRELOAD_MODULES=lvm'
- 'GRUB_TIMEOUT=20'
- - 'GRUB_CMDLINE_LINUX="noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
+ - 'GRUB_CMDLINE_LINUX="intel_iommu=on noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
kernelParameters:
sysctl:
kernel.dmesg_restrict: "1"
@@ -156,8 +154,7 @@
spec:
devices:
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-1
+ hctl: "4:0:0:0"
minSize: 60Gi
wipeDevice:
eraseMetadata:
@@ -174,8 +171,7 @@
- name: root
size: 0
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-2
+ hctl: "5:0:0:0"
wipe: true
fileSystems:
- fileSystem: vfat
@@ -202,7 +198,7 @@
- 'GRUB_DISABLE_RECOVERY="true"'
- 'GRUB_PRELOAD_MODULES=lvm'
- 'GRUB_TIMEOUT=20'
- - 'GRUB_CMDLINE_LINUX="noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
+ - 'GRUB_CMDLINE_LINUX="intel_iommu=on noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
kernelParameters:
sysctl:
kernel.dmesg_restrict: "1"
@@ -227,8 +223,7 @@
spec:
devices:
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-1
+ hctl: "4:0:0:0"
minSize: 60Gi
wipeDevice:
eraseMetadata:
@@ -245,8 +240,7 @@
- name: root
size: 0
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-2
+ hctl: "5:0:0:0"
wipe: true
fileSystems:
- fileSystem: vfat
@@ -273,7 +267,7 @@
- 'GRUB_DISABLE_RECOVERY="true"'
- 'GRUB_PRELOAD_MODULES=lvm'
- 'GRUB_TIMEOUT=20'
- - 'GRUB_CMDLINE_LINUX="noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
+ - 'GRUB_CMDLINE_LINUX="intel_iommu=on noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
kernelParameters:
sysctl:
kernel.dmesg_restrict: "1"
@@ -298,8 +292,7 @@
spec:
devices:
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-1
+ hctl: "4:0:0:0"
minSize: 60Gi
wipeDevice:
eraseMetadata:
@@ -316,8 +309,7 @@
- name: root
size: 0
- device:
- workBy: "by_id,by_path,by_wwn,by_name"
- byPath: /dev/disk/by-path/pci-0000:00:1f.2-ata-2
+ hctl: "5:0:0:0"
wipe: true
fileSystems:
- fileSystem: vfat
@@ -344,7 +336,7 @@
- 'GRUB_DISABLE_RECOVERY="true"'
- 'GRUB_PRELOAD_MODULES=lvm'
- 'GRUB_TIMEOUT=20'
- - 'GRUB_CMDLINE_LINUX="noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
+ - 'GRUB_CMDLINE_LINUX="intel_iommu=on noibrs noibpb nopti nospectre_v2 nospectre_v1 l1tf=off nospec_store_bypass_disable no_stf_barrier mds=off tsx=on tsx_async_abort=off mitigations=off systemd.journald.forward_to_console=yes console=ttyS0,9600 console=tty0"'
kernelParameters:
sysctl:
kernel.dmesg_restrict: "1"
diff --git a/bm_mcc_mosk/child/cluster/baremetalhosts.yaml b/bm_mcc_mosk/child/cluster/baremetalhosts.yaml
index df63c79..61ee873 100644
--- a/bm_mcc_mosk/child/cluster/baremetalhosts.yaml
+++ b/bm_mcc_mosk/child/cluster/baremetalhosts.yaml
@@ -23,18 +23,18 @@
password:
value: KBwdcRqwed3w2
---
-#apiVersion: kaas.mirantis.com/v1alpha1
-#kind: BareMetalHostCredential
-#metadata:
-# name: cz7756-bmc-credentials
-# namespace: mosk
-# labels:
-# kaas.mirantis.com/provider: baremetal
-#spec:
-# username: engineer
-# password:
-# value: KBwdcRqwed3w2
-#---
+apiVersion: kaas.mirantis.com/v1alpha1
+kind: BareMetalHostCredential
+metadata:
+ name: cz7756-bmc-credentials
+ namespace: mosk
+ labels:
+ kaas.mirantis.com/provider: baremetal
+spec:
+ username: engineer
+ password:
+ value: KBwdcRqwed3w2
+---
apiVersion: kaas.mirantis.com/v1alpha1
kind: BareMetalHostCredential
metadata:
@@ -183,25 +183,25 @@
address: 185.8.59.229
credentialsName: 'cz7627-bmc-credentials'
---
-#apiVersion: metal3.io/v1alpha1
-#kind: BareMetalHost
-#metadata:
-# name: cz7756
-# labels:
-# kaas.mirantis.com/provider: baremetal
-# baremetal: hw-cz7756
-# "hostlabel.bm.kaas.mirantis.com/storage": "storage"
-# "hostlabel.bm.kaas.mirantis.com/worker": "worker"
-# "hostlabel.bm.kaas.mirantis.com/os_ctl": "os_ctl"
-# annotations:
-# "kaas.mirantis.com/baremetalhost-credentials-name": "cz7756-bmc-credentials"
-#spec:
-# bootMode: legacy
-# online: true
-# bootMACAddress: 0c:c4:7a:69:a0:4c
-# bmc:
-# address: 5.43.225.88
-# credentialsName: 'cz7756-bmc-credentials'
+apiVersion: metal3.io/v1alpha1
+kind: BareMetalHost
+metadata:
+ name: cz7756
+ labels:
+ kaas.mirantis.com/provider: baremetal
+ baremetal: hw-cz7756
+ "hostlabel.bm.kaas.mirantis.com/storage": "storage"
+ "hostlabel.bm.kaas.mirantis.com/worker": "worker"
+ "hostlabel.bm.kaas.mirantis.com/os_ctl": "os_ctl"
+ annotations:
+ "kaas.mirantis.com/baremetalhost-credentials-name": "cz7756-bmc-credentials"
+spec:
+ bootMode: legacy
+ online: true
+ bootMACAddress: 0c:c4:7a:69:a0:4c
+ bmc:
+ address: 5.43.225.88
+ credentialsName: 'cz7756-bmc-credentials'
---
apiVersion: metal3.io/v1alpha1
kind: BareMetalHost
diff --git a/bm_mcc_mosk/child/cluster/cluster.yaml b/bm_mcc_mosk/child/cluster/cluster.yaml
index ec27963..133b388 100644
--- a/bm_mcc_mosk/child/cluster/cluster.yaml
+++ b/bm_mcc_mosk/child/cluster/cluster.yaml
@@ -16,10 +16,8 @@
providerSpec:
value:
kind: BaremetalClusterProviderSpec
- #release: mosk-17-2-4-24-2-2
- release: mosk-17-2-3-24-2-1
- loadBalancerHost: 172.16.180.250
-# loadBalancerHost: ""
+ release: mosk-17-3-0-24-3
+ loadBalancerHost: ''
apiVersion: baremetal.k8s.io/v1alpha1
dedicatedControlPlane: false
dedicatedMetallbPools: false
@@ -31,8 +29,6 @@
- name: pglazov
- name: dmeltsaykin
- name: rlubianyi
- dnsNameservers:
- - 172.18.176.6
helmReleases:
- enabled: true
name: ceph-controller
@@ -51,7 +47,4 @@
kaas:
management:
enabled: false
-# provider: baremetal
keycloak: {}
- release: kaas-2-26-0
-# nodeCidr: 10.10.10.0/24
diff --git a/bm_mcc_mosk/child/cluster/subnets.yaml b/bm_mcc_mosk/child/cluster/subnets.yaml
index cd8bb1e..f0b57e2 100644
--- a/bm_mcc_mosk/child/cluster/subnets.yaml
+++ b/bm_mcc_mosk/child/cluster/subnets.yaml
@@ -14,6 +14,20 @@
nameservers:
- 172.18.176.6
---
+apiVersion: "ipam.mirantis.com/v1alpha1"
+kind: Subnet
+# ONE ip addr! for cluster:spec:loadBalancerHost
+metadata:
+ name: k8s-api-lb
+ namespace: mosk
+ labels:
+ kaas.mirantis.com/provider: baremetal
+ cluster.sigs.k8s.io/cluster-name: mosk
+ ipam/SVC-LBhost: "1"
+spec:
+ cidr: 172.16.180.250/32
+ useWholeCidr: true
+---
apiVersion: ipam.mirantis.com/v1alpha1
kind: Subnet
metadata: