From b904de080f6c0847422debf5bf21a48baf0175fc Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 19 Apr 2024 15:41:47 +0200 Subject: [PATCH 1/3] Add us region billing rates --- config/billing_rates.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/config/billing_rates.yml b/config/billing_rates.yml index 5ef283a23..a01979be2 100644 --- a/config/billing_rates.yml +++ b/config/billing_rates.yml @@ -1,21 +1,33 @@ - { id: 139d9a67-8182-8578-a303-235cabd5161c, resource_type: VmCores, resource_family: standard, location: hetzner-fsn1, unit_price: 0.000622768 } - { id: 08c502f7-df5d-8978-9896-feafa0ec5c40, resource_type: VmCores, resource_family: standard, location: hetzner-hel1, unit_price: 0.000595982 } - { id: 2acc2bbf-d451-49c6-93de-db8d15311042, resource_type: VmCores, resource_family: standard, location: github-runners, unit_price: 0.000595982 } +- { id: 8cc76122-1463-8178-a89a-3b74434d1943, resource_type: VmCores, resource_family: standard, location: leaseweb-wdc02, unit_price: 0.000622768 } +- { id: 0f189c1f-b182-8978-bc1c-d1e0412718c3, resource_type: VmCores, resource_family: standard, location: leaseweb-dal13, unit_price: 0.000622768 } - { id: 118b7e2d-fa8d-8d78-910d-1f62fcc657ec, resource_type: IPAddress, resource_family: IPv4, location: hetzner-fsn1, unit_price: 0.000074405 } - { id: 1bde2200-545a-8d78-960e-08a303111e3d, resource_type: IPAddress, resource_family: IPv4, location: hetzner-hel1, unit_price: 0.000074405 } - { id: 38685ec4-38eb-4460-aed3-8a36bab14175, resource_type: IPAddress, resource_family: IPv4, location: github-runners, unit_price: 0.000074405 } +- { id: eda0ff7c-23b4-8178-8184-722acbffcbb8, resource_type: IPAddress, resource_family: IPv4, location: leaseweb-wdc02, unit_price: 0.000074405 } +- { id: 13e58492-7cff-8d78-adf4-e44561d9346d, resource_type: IPAddress, resource_family: IPv4, location: leaseweb-dal13, unit_price: 0.000074405 } - { id: 36b3883a-a72a-4c08-a4c6-482f4f91e148, resource_type: PostgresCores, resource_family: standard, location: hetzner-fsn1, unit_price: 0.001252425 } - { id: a5ef9efa-95eb-400b-a66a-31dd9d7a654a, resource_type: PostgresCores, resource_family: standard, location: hetzner-hel1, unit_price: 0.001198557 } - { id: 10ac0c66-ad6f-49f9-9c89-f676501eacea, resource_type: PostgresCores, resource_family: standard, location: github-runners, unit_price: 0.001198557 } +- { id: a35575ae-a5dd-8578-961c-021c7e8e2514, resource_type: PostgresCores, resource_family: standard, location: leaseweb-wdc02, unit_price: 0.001252425 } +- { id: 3d692cf3-804c-8d78-9b38-c54854052e71, resource_type: PostgresCores, resource_family: standard, location: leaseweb-dal13, unit_price: 0.001252425 } - { id: 46db9ff6-7f5a-4942-bd1a-6feccfe6c970, resource_type: PostgresStandbyCores, resource_family: standard, location: hetzner-fsn1, unit_price: 0.001252425 } - { id: 9cf57048-6fcf-43f7-9dc6-b712e4778ff7, resource_type: PostgresStandbyCores, resource_family: standard, location: hetzner-hel1, unit_price: 0.001198557 } - { id: 958daf3e-df4e-4f5d-93be-7ca63ef742ce, resource_type: PostgresStandbyCores, resource_family: standard, location: github-runners, unit_price: 0.001198557 } +- { id: 3baf8cbe-4f67-8d78-a71e-328d695e87b1, resource_type: PostgresStandbyCores, resource_family: standard, location: leaseweb-wdc02, unit_price: 0.001252425 } +- { id: 29e4c2f7-f012-8978-8e08-7606c607ac9c, resource_type: PostgresStandbyCores, resource_family: standard, location: leaseweb-dal13, unit_price: 0.001252425 } - { id: 80aa487a-0aa7-472f-a52c-d82a96067cba, resource_type: PostgresStorage, resource_family: standard, location: hetzner-fsn1, unit_price: 0.000002810 } - { id: c41422cd-9e28-46bd-acd4-02debfcd26a2, resource_type: PostgresStorage, resource_family: standard, location: hetzner-hel1, unit_price: 0.000002810 } - { id: b8d48f79-8131-46aa-b898-dba1c21d0954, resource_type: PostgresStorage, resource_family: standard, location: github-runners, unit_price: 0.000002810 } +- { id: 0a45042a-6d20-8978-af02-dfaf3f40cd28, resource_type: PostgresStorage, resource_family: standard, location: leaseweb-wdc02, unit_price: 0.000002810 } +- { id: 5f19cb91-1cff-8d78-881a-1927e5fcdb98, resource_type: PostgresStorage, resource_family: standard, location: leaseweb-dal13, unit_price: 0.000002810 } - { id: eaf2d6df-c63c-4dd1-9aa4-00e08785fb59, resource_type: PostgresStandbyStorage, resource_family: standard, location: hetzner-fsn1, unit_price: 0.000002810 } - { id: 10e65151-b0e2-4a33-9834-c3b4549a0d98, resource_type: PostgresStandbyStorage, resource_family: standard, location: hetzner-hel1, unit_price: 0.000002810 } - { id: f9f47985-f9fe-42b6-a8d8-c086d557f224, resource_type: PostgresStandbyStorage, resource_family: standard, location: github-runners, unit_price: 0.000002810 } +- { id: 4b8afe08-bc0e-8978-bc23-e38973e5b3d4, resource_type: PostgresStandbyStorage, resource_family: standard, location: leaseweb-wdc02, unit_price: 0.000002810 } +- { id: 1172b71c-4c1f-8978-aa10-b9e73822a8e4, resource_type: PostgresStandbyStorage, resource_family: standard, location: leaseweb-dal13, unit_price: 0.000002810 } - { id: d772d0aa-0b40-4b7a-aceb-72f6211f7cad, resource_type: GitHubRunnerMinutes, resource_family: standard-2, location: global, unit_price: 0.0008 } - { id: d885c82d-b139-40d5-890f-de3720896b3b, resource_type: GitHubRunnerMinutes, resource_family: standard-4, location: global, unit_price: 0.0016 } - { id: e50e6bff-6ee9-493b-bc09-75f122863d08, resource_type: GitHubRunnerMinutes, resource_family: standard-8, location: global, unit_price: 0.0032 } From a7d7ac0ff0aef917b3fd55663d1fdb7467b81f04 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 19 Apr 2024 15:42:04 +0200 Subject: [PATCH 2/3] Add Leaseweb as a new provider --- config/providers.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/config/providers.yml b/config/providers.yml index 71925cff8..aff9eb197 100644 --- a/config/providers.yml +++ b/config/providers.yml @@ -7,5 +7,13 @@ {display_name: eu-north-h1, internal_name: hetzner-hel1, visible: true }, {display_name: github-runners, internal_name: github-runners, visible: false } ] + }, + { + provider_display_name: Leaseweb, + provider_internal_name: leaseweb, + locations: [ + {display_name: us-east-a2, internal_name: leaseweb-wdc02, visible: false}, + {display_name: us-south-a13, internal_name: leaseweb-dal13, visible: false}, + ] } ] From 6e8de01b87b4ca1eb64c89a99a19f1d28b1f1a58 Mon Sep 17 00:00:00 2001 From: Furkan Sahin Date: Fri, 19 Apr 2024 16:08:16 +0200 Subject: [PATCH 3/3] Install acl for setfacl This package was included in Hetzner but not in Leaseweb. Therefore, we had to make this change to support the Leaseweb as a provider. --- rhizome/host/bin/prep_host.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rhizome/host/bin/prep_host.rb b/rhizome/host/bin/prep_host.rb index d7c830f1d..c22859495 100755 --- a/rhizome/host/bin/prep_host.rb +++ b/rhizome/host/bin/prep_host.rb @@ -90,7 +90,9 @@ # For qemu-image convert and mcopy for cloud-init with the nocloud # driver. -r "apt-get -y install qemu-utils mtools" +# acl is for setfacl, which is used to set permissions and not installed +# by default in Leaseweb servers. +r "apt-get -y install qemu-utils mtools acl" # We need nvme-cli to inspect installed NVMe cards in prod servers when # looking into I/O performance issues.