Skip to content

Commit 35378a9

Browse files
amstutaamstuta
authored
Merge pull request #910 from ovh/dev/aamstutz/fix-dedicated-reinstall-doc
fix: Set the right fields in doc of resource ovh_dedicated_server_reinstall_task
2 parents 32dc17b + 767fe81 commit 35378a9

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎docs/resources/dedicated_server_reinstall_task.md

+19-19
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ data "ovh_dedicated_installation_template" "template" {
2222
}
2323
2424
resource "ovh_dedicated_server_reinstall_task" "server_reinstall" {
25-
service_name = data.ovh_dedicated_server.server.service_name
26-
operating_system = data.ovh_dedicated_installation_template.template.template_name
25+
service_name = data.ovh_dedicated_server.server.service_name
26+
os = data.ovh_dedicated_installation_template.template.template_name
2727
}
2828
```
2929

@@ -39,8 +39,8 @@ data "ovh_dedicated_installation_template" "template" {
3939
}
4040
4141
resource "ovh_dedicated_server_reinstall_task" "server_reinstall" {
42-
service_name = data.ovh_dedicated_server.server.service_name
43-
operating_system = data.ovh_dedicated_installation_template.template.template_name
42+
service_name = data.ovh_dedicated_server.server.service_name
43+
os = data.ovh_dedicated_installation_template.template.template_name
4444
customizations {
4545
hostname = "mon-tux"
4646
post_installation_script = "IyEvYmluL2Jhc2gKZWNobyAiY291Y291IHBvc3RJbnN0YWxsYXRpb25TY3JpcHQiID4gL29wdC9jb3Vjb3UKY2F0IC9ldGMvbWFjaGluZS1pZCAgPj4gL29wdC9jb3Vjb3UKZGF0ZSAiKyVZLSVtLSVkICVIOiVNOiVTIiAtLXV0YyA+PiAvb3B0L2NvdWNvdQo="
@@ -78,8 +78,8 @@ data "ovh_dedicated_installation_template" "template" {
7878
}
7979
8080
resource "ovh_dedicated_server_reinstall_task" "server_install" {
81-
service_name = data.ovh_dedicated_server.server.service_name
82-
operating_system = "win2022core-std_64"
81+
service_name = data.ovh_dedicated_server.server.service_name
82+
os = "win2022core-std_64"
8383
customizations {
8484
hostname = "ma-fenetre"
8585
language = "fr-fr"
@@ -116,8 +116,8 @@ data "ovh_dedicated_installation_template" "template" {
116116
}
117117
118118
resource "ovh_dedicated_server_reinstall_task" "server_install" {
119-
service_name = data.ovh_dedicated_server.server.service_name
120-
os = "byolinux_64"
119+
service_name = data.ovh_dedicated_server.server.service_name
120+
os = "byolinux_64"
121121
customizations {
122122
config_drive_user_data = "I2Nsb3VkLWNvbmZpZwpzc2hfYXV0aG9yaXplZF9rZXlzOgogIC0gc3NoLXJzYSBBQUFBQjhkallpdz09IG15c2VsZkBteWRvbWFpbi5uZXQKCnVzZXJzOgogIC0gbmFtZTogcGF0aWVudDAKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIGdyb3VwczogdXNlcnMsIHN1ZG8KICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBmYWxzZQogICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAgLSBzc2gtcnNhIEFBQUFCOGRqWWl3PT0gbXlzZWxmQG15ZG9tYWluLm5ldApkaXNhYmxlX3Jvb3Q6IGZhbHNlCnBhY2thZ2VzOgogIC0gdmltCiAgLSB0cmVlCmZpbmFsX21lc3NhZ2U6IFRoZSBzeXN0ZW0gaXMgZmluYWxseSB1cCwgYWZ0ZXIgJFVQVElNRSBzZWNvbmRzCg=="
123123
hostname = "mon-tux"
@@ -128,7 +128,7 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
128128
image_check_sum_type = "sha512"
129129
image_url = "https://github.com/ashmonger/akution_test/releases/download/0.5-compress/deb11k6.qcow2"
130130
}
131-
properties {
131+
properties = {
132132
essential = "false"
133133
role = "webservers"
134134
}
@@ -166,8 +166,8 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
166166
mount_point = "/"
167167
raid_level = 1
168168
size = 20480
169-
extras = {
170-
lv = {
169+
extras {
170+
lv {
171171
name = "root"
172172
}
173173
}
@@ -182,8 +182,8 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
182182
mount_point = "/data"
183183
raid_level = 5
184184
size = 0
185-
extras = {
186-
zp = {
185+
extras {
186+
zp {
187187
name = "poule"
188188
}
189189
}
@@ -205,17 +205,17 @@ data "ovh_dedicated_installation_template" "template" {
205205
}
206206
207207
resource "ovh_dedicated_server_reinstall_task" "server_install" {
208-
service_name = data.ovh_dedicated_server.server.service_name
209-
os = data.ovh_dedicated_installation_template.template.template_name
208+
service_name = data.ovh_dedicated_server.server.service_name
209+
os = data.ovh_dedicated_installation_template.template.template_name
210210
customizations {
211211
hostname = "mon-tux"
212212
}
213213
storage {
214+
disk_group_id = 2
215+
hardware_raid {
216+
raid_level = 5
217+
}
214218
partitioning {
215-
disk_group_id = 2
216-
hardware_raid {
217-
raid_level = 5
218-
}
219219
layout {
220220
file_system = "ext4"
221221
mount_point = "/"

‎examples/resources/dedicated_server_reinstall_task/example_1.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ data "ovh_dedicated_installation_template" "template" {
77
}
88

99
resource "ovh_dedicated_server_reinstall_task" "server_reinstall" {
10-
service_name = data.ovh_dedicated_server.server.service_name
11-
operating_system = data.ovh_dedicated_installation_template.template.template_name
10+
service_name = data.ovh_dedicated_server.server.service_name
11+
os = data.ovh_dedicated_installation_template.template.template_name
1212
}

‎examples/resources/dedicated_server_reinstall_task/example_2.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ data "ovh_dedicated_installation_template" "template" {
77
}
88

99
resource "ovh_dedicated_server_reinstall_task" "server_reinstall" {
10-
service_name = data.ovh_dedicated_server.server.service_name
11-
operating_system = data.ovh_dedicated_installation_template.template.template_name
10+
service_name = data.ovh_dedicated_server.server.service_name
11+
os = data.ovh_dedicated_installation_template.template.template_name
1212
customizations {
1313
hostname = "mon-tux"
1414
post_installation_script = "IyEvYmluL2Jhc2gKZWNobyAiY291Y291IHBvc3RJbnN0YWxsYXRpb25TY3JpcHQiID4gL29wdC9jb3Vjb3UKY2F0IC9ldGMvbWFjaGluZS1pZCAgPj4gL29wdC9jb3Vjb3UKZGF0ZSAiKyVZLSVtLSVkICVIOiVNOiVTIiAtLXV0YyA+PiAvb3B0L2NvdWNvdQo="

‎examples/resources/dedicated_server_reinstall_task/example_3.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ data "ovh_dedicated_installation_template" "template" {
77
}
88

99
resource "ovh_dedicated_server_reinstall_task" "server_install" {
10-
service_name = data.ovh_dedicated_server.server.service_name
11-
operating_system = "win2022core-std_64"
10+
service_name = data.ovh_dedicated_server.server.service_name
11+
os = "win2022core-std_64"
1212
customizations {
1313
hostname = "ma-fenetre"
1414
language = "fr-fr"

‎examples/resources/dedicated_server_reinstall_task/example_4.tf

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ data "ovh_dedicated_installation_template" "template" {
77
}
88

99
resource "ovh_dedicated_server_reinstall_task" "server_install" {
10-
service_name = data.ovh_dedicated_server.server.service_name
11-
os = "byolinux_64"
10+
service_name = data.ovh_dedicated_server.server.service_name
11+
os = "byolinux_64"
1212
customizations {
1313
config_drive_user_data = "I2Nsb3VkLWNvbmZpZwpzc2hfYXV0aG9yaXplZF9rZXlzOgogIC0gc3NoLXJzYSBBQUFBQjhkallpdz09IG15c2VsZkBteWRvbWFpbi5uZXQKCnVzZXJzOgogIC0gbmFtZTogcGF0aWVudDAKICAgIHN1ZG86IEFMTD0oQUxMKSBOT1BBU1NXRDpBTEwKICAgIGdyb3VwczogdXNlcnMsIHN1ZG8KICAgIHNoZWxsOiAvYmluL2Jhc2gKICAgIGxvY2tfcGFzc3dkOiBmYWxzZQogICAgc3NoX2F1dGhvcml6ZWRfa2V5czoKICAgICAgLSBzc2gtcnNhIEFBQUFCOGRqWWl3PT0gbXlzZWxmQG15ZG9tYWluLm5ldApkaXNhYmxlX3Jvb3Q6IGZhbHNlCnBhY2thZ2VzOgogIC0gdmltCiAgLSB0cmVlCmZpbmFsX21lc3NhZ2U6IFRoZSBzeXN0ZW0gaXMgZmluYWxseSB1cCwgYWZ0ZXIgJFVQVElNRSBzZWNvbmRzCg=="
1414
hostname = "mon-tux"
@@ -19,7 +19,7 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
1919
image_check_sum_type = "sha512"
2020
image_url = "https://github.com/ashmonger/akution_test/releases/download/0.5-compress/deb11k6.qcow2"
2121
}
22-
properties {
22+
properties = {
2323
essential = "false"
2424
role = "webservers"
2525
}

‎examples/resources/dedicated_server_reinstall_task/example_5.tf

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
2626
mount_point = "/"
2727
raid_level = 1
2828
size = 20480
29-
extras = {
30-
lv = {
29+
extras {
30+
lv {
3131
name = "root"
3232
}
3333
}
@@ -42,8 +42,8 @@ resource "ovh_dedicated_server_reinstall_task" "server_install" {
4242
mount_point = "/data"
4343
raid_level = 5
4444
size = 0
45-
extras = {
46-
zp = {
45+
extras {
46+
zp {
4747
name = "poule"
4848
}
4949
}

‎examples/resources/dedicated_server_reinstall_task/example_6.tf

+6-6
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ data "ovh_dedicated_installation_template" "template" {
77
}
88

99
resource "ovh_dedicated_server_reinstall_task" "server_install" {
10-
service_name = data.ovh_dedicated_server.server.service_name
11-
os = data.ovh_dedicated_installation_template.template.template_name
10+
service_name = data.ovh_dedicated_server.server.service_name
11+
os = data.ovh_dedicated_installation_template.template.template_name
1212
customizations {
1313
hostname = "mon-tux"
1414
}
1515
storage {
16+
disk_group_id = 2
17+
hardware_raid {
18+
raid_level = 5
19+
}
1620
partitioning {
17-
disk_group_id = 2
18-
hardware_raid {
19-
raid_level = 5
20-
}
2121
layout {
2222
file_system = "ext4"
2323
mount_point = "/"

0 commit comments

Comments
 (0)