shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

M #-: Update EC2 driver list & typo

Browse Source 
- Fixes typo in comment in restore action for KVM
- Updates list of instance types for EC2 driver
This commit is contained in:
harsxv 2023-11-22 14:41:50 +01:00 committed by Ruben S. Montero
parent 925df9b805
commit 23decf1d53
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
2 changed files with 94 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

195
src/vmm_mad/remotes/ec2/ec2_driver.conf
View File

@ -1,24 +1,30 @@
:proxy_uri:
:state_wait_timeout_seconds: 1500
:instance_types:
a1.medium:
cpu: 1
memory: 2.0
a1.large:
cpu: 2
memory: 4.0
a1.xlarge:
cpu: 4
memory: 8.0
a1.2xlarge:
cpu: 8
memory: 16.0
a1.4xlarge:
cpu: 16
memory: 32.0
a1.large:
cpu: 2
memory: 4.0
a1.medium:
cpu: 1
memory: 2.0
a1.metal:
cpu: 16
memory: 32.0
a1.xlarge:
c4.large:
cpu: 2
memory: 3.75
c4.xlarge:
cpu: 4
memory: 8.0
memory: 7.5
c4.2xlarge:
cpu: 8
memory: 15.0
@ -28,21 +34,12 @@
c4.8xlarge:
cpu: 36
memory: 60.0
c4.large:
c5.large:
cpu: 2
memory: 3.75
c4.xlarge:
memory: 4.0
c5.xlarge:
cpu: 4
memory: 7.5
c5.12xlarge:
cpu: 48
memory: 96.0
c5.18xlarge:
cpu: 72
memory: 144.0
c5.24xlarge:
cpu: 96
memory: 192.0
memory: 8.0
c5.2xlarge:
cpu: 8
memory: 16.0
@ -52,24 +49,24 @@
c5.9xlarge:
cpu: 36
memory: 72.0
c5.large:
cpu: 2
memory: 4.0
c5.12xlarge:
cpu: 48
memory: 96.0
c5.18xlarge:
cpu: 72
memory: 144.0
c5.24xlarge:
cpu: 96
memory: 192.0
c5.metal:
cpu: 96
memory: 192.0
c5.xlarge:
c5d.large:
cpu: 2
memory: 4.0
c5d.xlarge:
cpu: 4
memory: 8.0
c5d.12xlarge:
cpu: 48
memory: 96.0
c5d.18xlarge:
cpu: 72
memory: 144.0
c5d.24xlarge:
cpu: 96
memory: 192.0
c5d.2xlarge:
cpu: 8
memory: 16.0
@ -79,18 +76,24 @@
c5d.9xlarge:
cpu: 36
memory: 72.0
c5d.large:
cpu: 2
memory: 4.0
c5d.12xlarge:
cpu: 48
memory: 96.0
c5d.18xlarge:
cpu: 72
memory: 144.0
c5d.24xlarge:
cpu: 96
memory: 192.0
c5d.metal:
cpu: 96
memory: 192.0
c5d.xlarge:
c5n.large:
cpu: 2
memory: 5.25
c5n.xlarge:
cpu: 4
memory: 8.0
c5n.18xlarge:
cpu: 72
memory: 192.0
memory: 10.5
c5n.2xlarge:
cpu: 8
memory: 21.0
@ -100,21 +103,15 @@
c5n.9xlarge:
cpu: 36
memory: 96.0
c5n.large:
cpu: 2
memory: 5.25
c5n.18xlarge:
cpu: 72
memory: 192.0
c5n.metal:
cpu: 72
memory: 192.0
c5n.xlarge:
d2.xlarge:
cpu: 4
memory: 10.5
cc2.8xlarge:
cpu: 32
memory: 60.5
cr1.8xlarge:
cpu: 32
memory: 244.0
memory: 30.5
d2.2xlarge:
cpu: 8
memory: 61.0
@ -124,39 +121,33 @@
d2.8xlarge:
cpu: 36
memory: 244.0
d2.xlarge:
cpu: 4
memory: 30.5
f1.16xlarge:
cpu: 64
memory: 976.0
f1.2xlarge:
cpu: 8
memory: 122.0
f1.4xlarge:
cpu: 16
memory: 244.0
f1.16xlarge:
cpu: 64
memory: 976.0
g2.2xlarge:
cpu: 8
memory: 15.0
g2.8xlarge:
cpu: 32
memory: 60.0
g3.16xlarge:
cpu: 64
memory: 488.0
g3s.xlarge:
cpu: 4
memory: 30.5
g3.4xlarge:
cpu: 16
memory: 122.0
g3.8xlarge:
cpu: 32
memory: 244.0
g3s.xlarge:
cpu: 4
memory: 30.5
h1.16xlarge:
g3.16xlarge:
cpu: 64
memory: 256.0
memory: 488.0
h1.2xlarge:
cpu: 8
memory: 32.0
@ -166,9 +157,15 @@
h1.8xlarge:
cpu: 32
memory: 128.0
h1.16xlarge:
cpu: 64
memory: 256.0
hs1.8xlarge:
cpu: 17
cpu: 16
memory: 117.0
i2.xlarge:
cpu: 4
memory: 30.5
i2.2xlarge:
cpu: 8
memory: 61.0
@ -178,12 +175,12 @@
i2.8xlarge:
cpu: 32
memory: 244.0
i2.xlarge:
i3.large:
cpu: 2
memory: 15.25
i3.xlarge:
cpu: 4
memory: 30.5
i3.16xlarge:
cpu: 64
memory: 488.0
i3.2xlarge:
cpu: 8
memory: 61.0
@ -193,66 +190,60 @@
i3.8xlarge:
cpu: 32
memory: 244.0
i3.large:
cpu: 2
memory: 15.25
i3.16xlarge:
cpu: 64
memory: 488.0
i3.metal:
cpu: 72
memory: 512.0
i3.xlarge:
cpu: 4
memory: 30.5
m1.large:
cpu: 2
memory: 7.5
m1.medium:
cpu: 1
memory: 3.75
m1.small:
cpu: 1
memory: 1.7
m1.medium:
cpu: 1
memory: 3.75
m1.large:
cpu: 2
memory: 7.5
m1.xlarge:
cpu: 4
memory: 15.0
m2.xlarge:
cpu: 2
memory: 17.1
m2.2xlarge:
cpu: 4
memory: 34.2
m2.4xlarge:
cpu: 8
memory: 68.4
m2.xlarge:
cpu: 2
memory: 17.1
m3.2xlarge:
cpu: 8
memory: 30.0
m3.large:
cpu: 2
memory: 7.5
m3.medium:
cpu: 1
memory: 3.75
m3.xlarge:
cpu: 4
memory: 15.0
m4.10xlarge:
cpu: 40
memory: 160.0
m4.16xlarge:
cpu: 64
memory: 256.0
m4.2xlarge:
cpu: 8
memory: 32.0
m4.4xlarge:
cpu: 16
memory: 64.0
m4.large:
cpu: 2
memory: 8.0
m4.xlarge:
cpu: 4
memory: 16.0
m4.2xlarge:
cpu: 8
memory: 32.0
m4.4xlarge:
cpu: 16
memory: 64.0
m4.10xlarge:
cpu: 40
memory: 160.0
m4.16xlarge:
cpu: 64
memory: 256.0
m5.12xlarge:
cpu: 48
memory: 192.0

2
src/vmm_mad/remotes/kvm/restore
View File

@ -78,7 +78,7 @@ set -e -o pipefail
virsh --connect $LIBVIRT_URI save-image-dumpxml $FILE > $FILE_XML
# Eeplace all occurrences of the DS_LOCATION/<DS_ID>/<VM_ID> with the specific
# Replace all occurrences of the DS_LOCATION/<DS_ID>/<VM_ID> with the specific
# DS_ID where the checkpoint is placed. This is done in case there was a
# system DS migration