Skip to content

Commit f36f573

Browse files
authored
docs(baremetal): update partitionSchema to correct format (#3083)
* docs(baremetal): update partitionSchema to correct format * fix label name partition on the second disk
1 parent 942001a commit f36f573

File tree

1 file changed

+25
-20
lines changed

1 file changed

+25
-20
lines changed

docs/resources/baremetal_server.md

Lines changed: 25 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,28 +12,30 @@ Creates and manages Scaleway Compute Baremetal servers. For more information, se
1212
### Basic
1313

1414
```terraform
15-
data "scaleway_iam_ssh_key" "main" {
15+
data "scaleway_iam_ssh_key" "my_ssh_key" {
1616
name = "main"
17+
public_key = "ssh XXXXXXXXXXX"
1718
}
1819
1920
data "scaleway_baremetal_offer" "my_offer" {
2021
zone = "fr-par-2"
2122
name = "EM-I220E-NVME"
2223
}
2324
24-
resource "scaleway_baremetal_server" "base" {
25+
resource "scaleway_baremetal_server" "my_server" {
2526
zone = "fr-par-2"
2627
offer = data.scaleway_baremetal_offer.my_offer.offer_id
2728
os = "d17d6872-0412-45d9-a198-af82c34d3c5c"
28-
ssh_key_ids = [data.scaleway_account_ssh_key.main.id]
29+
ssh_key_ids = [data.scaleway_iam_ssh_key.my_ssh_key.id]
2930
}
3031
```
3132

3233
### With option
3334

3435
```terraform
35-
data "scaleway_iam_ssh_key" "main" {
36+
data "scaleway_iam_ssh_key" "my_ssh_key" {
3637
name = "main"
38+
public_key = "ssh XXXXXXXXXXX"
3739
}
3840
3941
data "scaleway_baremetal_os" "my_os" {
@@ -61,7 +63,7 @@ resource "scaleway_baremetal_server" "base" {
6163
zone = "fr-par-2"
6264
offer = data.scaleway_baremetal_offer.my_offer.offer_id
6365
os = data.scaleway_baremetal_os.my_os.os_id
64-
ssh_key_ids = [data.scaleway_account_ssh_key.main.id]
66+
ssh_key_ids = [data.scaleway_iam_ssh_key.my_ssh_key.id]
6567
6668
options {
6769
id = data.scaleway_baremetal_option.private_network.option_id
@@ -76,8 +78,9 @@ resource "scaleway_baremetal_server" "base" {
7678
### With private network
7779

7880
```terraform
79-
data "scaleway_iam_ssh_key" "main" {
81+
data "scaleway_iam_ssh_key" "my_ssh_key" {
8082
name = "main"
83+
public_key = "ssh XXXXXXXXXXX"
8184
}
8285
8386
data "scaleway_baremetal_os" "my_os" {
@@ -101,11 +104,11 @@ resource "scaleway_vpc_private_network" "pn" {
101104
name = "baremetal_private_network"
102105
}
103106
104-
resource "scaleway_baremetal_server" "base" {
107+
resource "scaleway_baremetal_server" "my_server" {
105108
zone = "fr-par-2"
106109
offer = data.scaleway_baremetal_offer.my_offer.offer_id
107110
os = data.scaleway_baremetal_os.my_os.os_id
108-
ssh_key_ids = [data.scaleway_account_ssh_key.main.id]
111+
ssh_key_ids = [data.scaleway_iam_ssh_key.my_ssh_key.id]
109112
110113
options {
111114
id = data.scaleway_baremetal_option.private_network.option_id
@@ -138,8 +141,9 @@ resource "scaleway_ipam_ip" "ip01" {
138141
}
139142
}
140143
141-
data "scaleway_iam_ssh_key" "my_key" {
144+
data "scaleway_iam_ssh_key" "my_ssh_key" {
142145
name = "main"
146+
public_key = "ssh XXXXXXXXXXX"
143147
}
144148
145149
data "scaleway_baremetal_os" "my_os" {
@@ -158,11 +162,11 @@ data "scaleway_baremetal_option" "private_network" {
158162
name = "Private Network"
159163
}
160164
161-
resource "scaleway_baremetal_server" "base" {
165+
resource "scaleway_baremetal_server" "my_server" {
162166
zone = "fr-par-2"
163167
offer = data.scaleway_baremetal_offer.my_offer.offer_id
164168
os = data.scaleway_baremetal_os.my_os.os_id
165-
ssh_key_ids = [data.scaleway_account_ssh_key.my_key.id]
169+
ssh_key_ids = [data.scaleway_iam_ssh_key.my_ssh_key.id]
166170
167171
options {
168172
id = data.scaleway_baremetal_option.private_network.option_id
@@ -182,7 +186,7 @@ data "scaleway_baremetal_offer" "my_offer" {
182186
name = "EM-B112X-SSD"
183187
}
184188
185-
resource "scaleway_baremetal_server" "base" {
189+
resource "scaleway_baremetal_server" "my_server" {
186190
zone = "fr-par-2"
187191
offer = data.scaleway_baremetal_offer.my_offer.offer_id
188192
install_config_afterward = true
@@ -193,7 +197,7 @@ resource "scaleway_baremetal_server" "base" {
193197

194198
```terraform
195199
variable "configCustomPartitioning" {
196-
default = "{\"disks\":[{\"device\":\"/dev/nvme0n1\",\"partitions\":[{\"label\":\"uefi\",\"number\":1,\"size\":536870912},{\"label\":\"swap\",\"number\":2,\"size\":4294967296},{\"label\":\"boot\",\"number\":3,\"size\":1073741824},{\"label\":\"root\",\"number\":4,\"size\":1017827045376}]},{\"device\":\"/dev/nvme1n1\",\"partitions\":[{\"label\":\"swap\",\"number\":1,\"size\":4294967296},{\"label\":\"boot\",\"number\":2,\"size\":1073741824},{\"label\":\"root\",\"number\":3,\"size\":1017827045376}]}],\"filesystems\":[{\"device\":\"/dev/nvme0n1p1\",\"format\":\"fat32\",\"mountpoint\":\"/boot/efi\"},{\"device\":\"/dev/md0\",\"format\":\"ext4\",\"mountpoint\":\"/boot\"},{\"device\":\"/dev/md1\",\"format\":\"ext4\",\"mountpoint\":\"/\"}],\"raids\":[{\"devices\":[\"/dev/nvme0n1p3\",\"/dev/nvme1n1p2\"],\"level\":\"raid_level_1\",\"name\":\"/dev/md0\"},{\"devices\":[\"/dev/nvme0n1p4\",\"/dev/nvme1n1p3\"],\"level\":\"raid_level_1\",\"name\":\"/dev/md1\"}],\"zfs\":{\"pools\":[]}}"
200+
default ="{\"disks\":[{\"device\":\"/dev/nvme0n1\",\"partitions\":[{\"label\":\"uefi\",\"number\":1,\"size\":536870912,\"useAllAvailableSpace\":false},{\"label\":\"boot\",\"number\":2,\"size\":536870912,\"useAllAvailableSpace\":false},{\"label\":\"root\",\"number\":3,\"size\":1018839433216,\"useAllAvailableSpace\":false}]},{\"device\":\"/dev/nvme1n1\",\"partitions\":[{\"label\":\"boot\",\"number\":1,\"size\":536870912,\"useAllAvailableSpace\":false},{\"label\":\"data\",\"number\":2,\"size\":1018839433216,\"useAllAvailableSpace\":false}]}],\"filesystems\":[{\"device\":\"/dev/nvme0n1p1\",\"format\":\"fat32\",\"mountpoint\":\"/boot/efi\"},{\"device\":\"/dev/nvme0n1p2\",\"format\":\"ext4\",\"mountpoint\":\"/boot\"},{\"device\":\"/dev/nvme0n1p3\",\"format\":\"ext4\",\"mountpoint\":\"/\"},{\"device\":\"/dev/nvme1n1p2\",\"format\":\"ext4\",\"mountpoint\":\"/data\"}],\"raids\":[]}"
197201
}
198202
199203
data "scaleway_baremetal_os" "my_os" {
@@ -202,8 +206,9 @@ data "scaleway_baremetal_os" "my_os" {
202206
version = "22.04 LTS (Jammy Jellyfish)"
203207
}
204208
205-
resource "scaleway_iam_ssh_key" "main" {
206-
name = "main"
209+
resource "scaleway_iam_ssh_key" "my_ssh_key" {
210+
name = "my_ssh_key"
211+
public_key = "ssh XXXXXXXXXXX"
207212
}
208213
209214
data "scaleway_baremetal_offer" "my_offer" {
@@ -212,16 +217,16 @@ data "scaleway_baremetal_offer" "my_offer" {
212217
subscription_period = "hourly"
213218
}
214219
215-
resource "scaleway_baremetal_server" "base" {
216-
name = "%s"
220+
resource "scaleway_baremetal_server" "my_server" {
221+
name = "my_super_server"
217222
zone = "fr-par-1"
218223
description = "test a description"
219224
offer = data.scaleway_baremetal_offer.my_offer.offer_id
220225
os = data.scaleway_baremetal_os.my_os.os_id
221226
partitioning = var.configCustomPartitioning
222227
223228
tags = [ "terraform-test", "scaleway_baremetal_server", "minimal" ]
224-
ssh_key_ids = [ scaleway_iam_ssh_key.main.id ]
229+
ssh_key_ids = [ scaleway_iam_ssh_key.my_ssh_key.id ]
225230
}
226231
227232
```
@@ -240,7 +245,7 @@ data "scaleway_baremetal_offer" "my_offer" {
240245
subscription_period = "hourly"
241246
}
242247
243-
resource "scaleway_baremetal_server" "server01" {
248+
resource "scaleway_baremetal_server" "my_server" {
244249
name = "UpdateSubscriptionPeriod"
245250
offer = data.scaleway_baremetal_offer.my_offer.offer_id
246251
zone = "%s"
@@ -257,7 +262,7 @@ data "scaleway_baremetal_offer" "my_offer" {
257262
subscription_period = "monthly"
258263
}
259264
260-
resource "scaleway_baremetal_server" "server01" {
265+
resource "scaleway_baremetal_server" "my_server" {
261266
name = "UpdateSubscriptionPeriod"
262267
offer = data.scaleway_baremetal_offer.my_offer.offer_id
263268
zone = "fr-par-1"

0 commit comments

Comments
 (0)