Merge pull request #8102 from hongkailiu/machine_config

Create machineconfig for m5d
openshift · Apr 3, 2020 · 8793336 · 8793336
2 parents 9e2b667 + ee2b442
commit 8793336
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 18 deletions.
diff --git a/clusters/build-clusters/01_cluster/machine_config/m5d_machineconfig.yaml b/clusters/build-clusters/01_cluster/machine_config/m5d_machineconfig.yaml
@@ -0,0 +1,49 @@
+apiVersion: machineconfiguration.openshift.io/v1
+kind: MachineConfig
+metadata:
+  labels:
+    machineconfiguration.openshift.io/role: worker
+  name: m5d
+spec:
+  config:
+    ignition:
+      version: 2.2.0
+    storage:
+      disks:
+      - device: "/dev/nvme1n1"
+        wipeTable: true
+        partitions:
+        - label: containerraid1
+          number: 0
+          start: 0
+          size: 0
+      - device: "/dev/nvme2n1"
+        wipeTable: true
+        partitions:
+        - label: containerraid2
+          number: 0
+          start: 0
+          size: 0
+      raid:
+      - devices:
+        - "/dev/disk/by-partlabel/containerraid1"
+        - "/dev/disk/by-partlabel/containerraid2"
+        level: stripe
+        name: containerraid
+      filesystems:
+      - mount:
+          device: "/dev/md/containerraid"
+          format: xfs
+          label: containers
+    systemd:
+      units:
+      - name: var-lib-containers.mount
+        enable: true
+        contents: |-
+          [Mount]
+          What=/dev/md/containerraid
+          Where=/var/lib/containers
+          Type=xfs
+
+          [Install]
+          WantedBy=local-fs.target
diff --git a/...s/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml b/...s/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml
@@ -30,17 +30,12 @@ spec:
           ami:
             id: ami-06f85a7940faa3217
           apiVersion: awsproviderconfig.openshift.io/v1beta1
-          blockDevices:
-          - ebs:
-              iops: 16000
-              volumeSize: 640
-              volumeType: io1
           credentialsSecret:
             name: aws-cloud-credentials
           deviceIndex: 0
           iamInstanceProfile:
             id: build01-9hdwj-worker-profile
-          instanceType: m5.4xlarge
+          instanceType: m5d.4xlarge
           kind: AWSMachineProviderConfig
           metadata:
             creationTimestamp: null

diff --git a/...s/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml b/...s/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml
@@ -30,17 +30,12 @@ spec:
           ami:
             id: ami-06f85a7940faa3217
           apiVersion: awsproviderconfig.openshift.io/v1beta1
-          blockDevices:
-          - ebs:
-              iops: 16000
-              volumeSize: 640
-              volumeType: io1
           credentialsSecret:
             name: aws-cloud-credentials
           deviceIndex: 0
           iamInstanceProfile:
             id: build01-9hdwj-worker-profile
-          instanceType: m5.4xlarge
+          instanceType: m5d.4xlarge
           kind: AWSMachineProviderConfig
           metadata:
             creationTimestamp: null

diff --git a/...s/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml b/...s/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml
@@ -30,17 +30,12 @@ spec:
           ami:
             id: ami-06f85a7940faa3217
           apiVersion: awsproviderconfig.openshift.io/v1beta1
-          blockDevices:
-          - ebs:
-              iops: 16000
-              volumeSize: 640
-              volumeType: io1
           credentialsSecret:
             name: aws-cloud-credentials
           deviceIndex: 0
           iamInstanceProfile:
             id: build01-9hdwj-worker-profile
-          instanceType: m5.4xlarge
+          instanceType: m5d.4xlarge
           kind: AWSMachineProviderConfig
           metadata:
             creationTimestamp: null