From 649bb7be234171bca312c25d073cc90168c5f8d6 Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Thu, 2 Apr 2020 09:55:00 -0400 Subject: [PATCH 1/2] Create machineconfig for m5d --- .../_machine_config/m5d_machineconfig.yaml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 clusters/build-clusters/01_cluster/_machine_config/m5d_machineconfig.yaml diff --git a/clusters/build-clusters/01_cluster/_machine_config/m5d_machineconfig.yaml b/clusters/build-clusters/01_cluster/_machine_config/m5d_machineconfig.yaml new file mode 100644 index 000000000000..1fd1ffd10849 --- /dev/null +++ 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 From ee2b442d7dc67dd54f09204c5fb1e67271e02831 Mon Sep 17 00:00:00 2001 From: Hongkai Liu Date: Thu, 2 Apr 2020 17:05:43 -0400 Subject: [PATCH 2/2] Modify the current machinesets --- .../m5d_machineconfig.yaml | 0 .../admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml | 7 +------ .../admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml | 7 +------ .../admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml | 7 +------ 4 files changed, 3 insertions(+), 18 deletions(-) rename clusters/build-clusters/01_cluster/{_machine_config => machine_config}/m5d_machineconfig.yaml (100%) diff --git a/clusters/build-clusters/01_cluster/_machine_config/m5d_machineconfig.yaml b/clusters/build-clusters/01_cluster/machine_config/m5d_machineconfig.yaml similarity index 100% rename from clusters/build-clusters/01_cluster/_machine_config/m5d_machineconfig.yaml rename to clusters/build-clusters/01_cluster/machine_config/m5d_machineconfig.yaml diff --git a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml index a28c8daf65cd..942616030d35 100644 --- a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1a_machine_set.yaml +++ b/clusters/build-clusters/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/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml index cd973a10c23d..f1f7658007ba 100644 --- a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1b_machine_set.yaml +++ b/clusters/build-clusters/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/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml b/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml index d002a5a97900..26814ce0b0ad 100644 --- a/clusters/build-clusters/01_cluster/openshift-machine-api/admin_build01-9hdwj-worker-us-east-1c_machine_set.yaml +++ b/clusters/build-clusters/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