From 8d278085677c318d874e24d3d1765dd5681a2b4f Mon Sep 17 00:00:00 2001 From: i504454 Date: Wed, 23 Oct 2024 16:34:24 +0300 Subject: [PATCH 1/2] Add medium VM type to cloud-config --- iaas-support/alicloud/cloud-config.yml | 4 ++++ iaas-support/openstack/cloud-config.yml | 3 +++ iaas-support/vsphere/cloud-config.yml | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/iaas-support/alicloud/cloud-config.yml b/iaas-support/alicloud/cloud-config.yml index 4b0850ce6..cbc90817d 100644 --- a/iaas-support/alicloud/cloud-config.yml +++ b/iaas-support/alicloud/cloud-config.yml @@ -26,6 +26,10 @@ vm_types: cloud_properties: instance_type: ecs.sn2ne.xlarge ephemeral_disk: {size: "51_200"} +- name: medium + cloud_properties: + instance_type: ecs.sn1.2xlarge + ephemeral_disk: {size: "51_200"} - name: compiler cloud_properties: instance_type: ecs.sn1.large diff --git a/iaas-support/openstack/cloud-config.yml b/iaas-support/openstack/cloud-config.yml index dd7580b44..58f175af3 100644 --- a/iaas-support/openstack/cloud-config.yml +++ b/iaas-support/openstack/cloud-config.yml @@ -14,6 +14,9 @@ vm_types: - name: small-highmem-100GB-ephemeral-disk cloud_properties: instance_type: small-highmem-100GB-ephemeral-disk +- name: medium + cloud_properties: + instance_type: m1.large disk_types: - name: 5GB diff --git a/iaas-support/vsphere/cloud-config.yml b/iaas-support/vsphere/cloud-config.yml index 4501907f4..c01d4d55b 100644 --- a/iaas-support/vsphere/cloud-config.yml +++ b/iaas-support/vsphere/cloud-config.yml @@ -63,6 +63,11 @@ vm_types: cpu: 4 ram: 32768 disk: 10240 +- name: medium + cloud_properties: + cpu: 8 + ram: 16384 + disk: 10240 disk_types: - disk_size: 5120 From 57ce1a196a67098c6ed131deb2e5add152c79a0f Mon Sep 17 00:00:00 2001 From: i504454 Date: Thu, 24 Oct 2024 15:24:48 +0300 Subject: [PATCH 2/2] adjust alicloud and openstack vm types --- iaas-support/alicloud/cloud-config.yml | 2 +- iaas-support/openstack/cloud-config.yml | 2 +- iaas-support/openstack/flavors.yml | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/iaas-support/alicloud/cloud-config.yml b/iaas-support/alicloud/cloud-config.yml index cbc90817d..245c0d987 100644 --- a/iaas-support/alicloud/cloud-config.yml +++ b/iaas-support/alicloud/cloud-config.yml @@ -28,7 +28,7 @@ vm_types: ephemeral_disk: {size: "51_200"} - name: medium cloud_properties: - instance_type: ecs.sn1.2xlarge + instance_type: ecs.sn1ne.2xlarge ephemeral_disk: {size: "51_200"} - name: compiler cloud_properties: diff --git a/iaas-support/openstack/cloud-config.yml b/iaas-support/openstack/cloud-config.yml index 58f175af3..28c423193 100644 --- a/iaas-support/openstack/cloud-config.yml +++ b/iaas-support/openstack/cloud-config.yml @@ -16,7 +16,7 @@ vm_types: instance_type: small-highmem-100GB-ephemeral-disk - name: medium cloud_properties: - instance_type: m1.large + instance_type: medium disk_types: - name: 5GB diff --git a/iaas-support/openstack/flavors.yml b/iaas-support/openstack/flavors.yml index ce0f7dc0a..ee52c27d5 100644 --- a/iaas-support/openstack/flavors.yml +++ b/iaas-support/openstack/flavors.yml @@ -19,3 +19,7 @@ ram: 31232 vcpus: 4 ephemeral: 100 +- name: medium + ram: 16384 + vcpus: 8 + ephemeral: 50