Skip to content

Commit 0e866a9

Browse files
j-kalij-kali
committed
!fixup
1 parent b97489a commit 0e866a9

File tree

1 file changed

+45
-45
lines changed

1 file changed

+45
-45
lines changed

‎terraform/server.tf

+45-45
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ terraform {
4242

4343
variable "instance_name" {
4444
# set with set-name.sh <instance_name>
45-
type = string
45+
type = string
4646
default = "hpcs.main"
4747
}
4848

@@ -52,27 +52,27 @@ locals {
5252
"cloud-config.yaml",
5353
{
5454
kind_dashboard_admin_yaml = base64encode(file("files/admin-user.yaml")),
55-
setup_sha512 = base64encode(sha512(file("files/setup.sh"))),
56-
ed25519_private = indent(4, file("secrets/ssh_host_ed25519_key")),
57-
ed25519_public = file("secrets/ssh_host_ed25519_key.pub"),
58-
hpcs_cluster_yaml = base64encode(file("files/hpcs-cluster.yaml")),
59-
public_keys = setsubtract(split("\n", trim(file("secrets/public_keys"), "\n")), [""] ),
60-
tunnel_keys = setsubtract(split("\n", trim(file("secrets/tunnel_keys"), "\n")), [""] ),
61-
setup_sh = base64encode(file("files/setup.sh")),
62-
})
55+
setup_sha512 = base64encode(sha512(file("files/setup.sh"))),
56+
ed25519_private = indent(4, file("secrets/ssh_host_ed25519_key")),
57+
ed25519_public = file("secrets/ssh_host_ed25519_key.pub"),
58+
hpcs_cluster_yaml = base64encode(file("files/hpcs-cluster.yaml")),
59+
public_keys = setsubtract(split("\n", trim(file("secrets/public_keys"), "\n")), [""]),
60+
tunnel_keys = setsubtract(split("\n", trim(file("secrets/tunnel_keys"), "\n")), [""]),
61+
setup_sh = base64encode(file("files/setup.sh")),
62+
})
6363
}
6464

6565
# The actual VM is defined here
6666
resource "openstack_compute_instance_v2" "instance" {
67-
name = "${var.instance_name}"
68-
image_name = "Ubuntu-24.04"
67+
name = var.instance_name
68+
image_name = "Ubuntu-24.04"
6969
flavor_name = "standard.small"
70-
user_data = local.cloud_init
70+
user_data = local.cloud_init
7171
security_groups = [
7272
openstack_networking_secgroup_v2.security_group.name,
7373
]
7474
network {
75-
uuid = "${openstack_networking_network_v2.instance_net.id}"
75+
uuid = openstack_networking_network_v2.instance_net.id
7676
}
7777
# Pouta API refuses to create the instance unless the subnet is ready to go
7878
depends_on = [
@@ -86,13 +86,13 @@ resource "openstack_compute_instance_v2" "instance" {
8686
# Network for the VM to be in. It is not allowed in most cases to have
8787
# VMs directly in the public network on Pouta
8888
resource "openstack_networking_network_v2" "instance_net" {
89-
name = "${var.instance_name}-net"
89+
name = "${var.instance_name}-net"
9090
admin_state_up = "true"
9191
}
9292

9393
# A router to attach the network defined earlier to the public network
9494
resource "openstack_networking_router_v2" "router" {
95-
name = "${var.instance_name}-router"
95+
name = "${var.instance_name}-router"
9696
admin_state_up = "true"
9797
# Magic UUID is the UUID of our public network, somewhat difficult
9898
# to refer to it by name here so we are stuck with the magic thing
@@ -102,13 +102,13 @@ resource "openstack_networking_router_v2" "router" {
102102

103103
# Attachment of the router to the VM subnet
104104
resource "openstack_networking_router_interface_v2" "interface" {
105-
router_id = "${openstack_networking_router_v2.router.id}"
106-
subnet_id = "${openstack_networking_subnet_v2.instance_subnet.id}"
105+
router_id = openstack_networking_router_v2.router.id
106+
subnet_id = openstack_networking_subnet_v2.instance_subnet.id
107107
}
108108

109109
# The floating ip, which will be a public IP used to access the VM
110110
resource "openstack_networking_floatingip_v2" "ip" {
111-
pool = "public"
111+
pool = "public"
112112
depends_on = [openstack_networking_router_interface_v2.interface]
113113
lifecycle {
114114
# Protect the public IP
@@ -121,23 +121,23 @@ resource "openstack_networking_floatingip_v2" "ip" {
121121
# one can redeploy an instance and attach the IP to the new instance
122122
# without the need to do anything about the IP object itself.
123123
resource "openstack_compute_floatingip_associate_v2" "ip_attach" {
124-
floating_ip = "${openstack_networking_floatingip_v2.ip.address}"
125-
instance_id = "${openstack_compute_instance_v2.instance.id}"
124+
floating_ip = openstack_networking_floatingip_v2.ip.address
125+
instance_id = openstack_compute_instance_v2.instance.id
126126
}
127127

128128
# Volume to store some data that we want to preserve during re-deployments
129129
resource "openstack_blockstorage_volume_v3" "data" {
130-
name = "${var.instance_name}-data"
131-
size = 10
130+
name = "${var.instance_name}-data"
131+
size = 10
132132
lifecycle {
133133
# Do not destroy the volume... ever...
134134
prevent_destroy = true
135135
}
136136
}
137137

138138
resource "openstack_blockstorage_volume_v3" "docker" {
139-
name = "${var.instance_name}-docker"
140-
size = 20
139+
name = "${var.instance_name}-docker"
140+
size = 20
141141
lifecycle {
142142
# Do not destroy the volume... ever...
143143
prevent_destroy = true
@@ -147,20 +147,20 @@ resource "openstack_blockstorage_volume_v3" "docker" {
147147
# Similarly to the floating ip case, we need an attachment of the volume
148148
# defined above
149149
resource "openstack_compute_volume_attach_v2" "data" {
150-
instance_id = "${openstack_compute_instance_v2.instance.id}"
151-
volume_id = "${openstack_blockstorage_volume_v3.data.id}"
150+
instance_id = openstack_compute_instance_v2.instance.id
151+
volume_id = openstack_blockstorage_volume_v3.data.id
152152
}
153153

154154
resource "openstack_compute_volume_attach_v2" "docker" {
155-
instance_id = "${openstack_compute_instance_v2.instance.id}"
156-
volume_id = "${openstack_blockstorage_volume_v3.docker.id}"
155+
instance_id = openstack_compute_instance_v2.instance.id
156+
volume_id = openstack_blockstorage_volume_v3.docker.id
157157
}
158158

159159
#######################################################################
160160
# Security group and its rules
161161
#######################################################################
162162
resource "openstack_networking_secgroup_v2" "security_group" {
163-
name = "${var.instance_name}"
163+
name = var.instance_name
164164
}
165165

166166
resource "openstack_networking_secgroup_rule_v2" "ssh-in-staff-vpn" {
@@ -170,7 +170,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-staff-vpn" {
170170
port_range_min = 22
171171
port_range_max = 22
172172
remote_ip_prefix = "193.166.85.0/24"
173-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
173+
security_group_id = openstack_networking_secgroup_v2.security_group.id
174174
}
175175

176176
resource "openstack_networking_secgroup_rule_v2" "ssh-in-espoo-office-00" {
@@ -180,7 +180,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-espoo-office-00" {
180180
port_range_min = 22
181181
port_range_max = 22
182182
remote_ip_prefix = "193.166.1.0/24"
183-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
183+
security_group_id = openstack_networking_secgroup_v2.security_group.id
184184
}
185185

186186
resource "openstack_networking_secgroup_rule_v2" "ssh-in-espoo-office-01" {
@@ -190,7 +190,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-espoo-office-01" {
190190
port_range_min = 22
191191
port_range_max = 22
192192
remote_ip_prefix = "193.166.2.0/24"
193-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
193+
security_group_id = openstack_networking_secgroup_v2.security_group.id
194194
}
195195

196196
resource "openstack_networking_secgroup_rule_v2" "ssh-in-espoo-office-02" {
@@ -200,7 +200,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-espoo-office-02" {
200200
port_range_min = 22
201201
port_range_max = 22
202202
remote_ip_prefix = "193.166.80.0/23"
203-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
203+
security_group_id = openstack_networking_secgroup_v2.security_group.id
204204
}
205205

206206
resource "openstack_networking_secgroup_rule_v2" "ssh-in-kajaani-office-00" {
@@ -210,7 +210,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-kajaani-office-00" {
210210
port_range_min = 22
211211
port_range_max = 22
212212
remote_ip_prefix = "193.166.86.0/24"
213-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
213+
security_group_id = openstack_networking_secgroup_v2.security_group.id
214214
}
215215

216216
resource "openstack_networking_secgroup_rule_v2" "ssh-in-pa-vpn-00" {
@@ -220,7 +220,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-pa-vpn-00" {
220220
port_range_min = 22
221221
port_range_max = 22
222222
remote_ip_prefix = "193.166.83.0/24"
223-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
223+
security_group_id = openstack_networking_secgroup_v2.security_group.id
224224
}
225225

226226
resource "openstack_networking_secgroup_rule_v2" "ssh-in-jaroslaw-00" {
@@ -230,7 +230,7 @@ resource "openstack_networking_secgroup_rule_v2" "ssh-in-jaroslaw-00" {
230230
port_range_min = 22
231231
port_range_max = 22
232232
remote_ip_prefix = "87.94.57.247/24"
233-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
233+
security_group_id = openstack_networking_secgroup_v2.security_group.id
234234
}
235235

236236
resource "openstack_networking_secgroup_rule_v2" "http-out" {
@@ -240,7 +240,7 @@ resource "openstack_networking_secgroup_rule_v2" "http-out" {
240240
port_range_min = 80
241241
port_range_max = 80
242242
remote_ip_prefix = "0.0.0.0/0"
243-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
243+
security_group_id = openstack_networking_secgroup_v2.security_group.id
244244
}
245245

246246
resource "openstack_networking_secgroup_rule_v2" "http-in" {
@@ -260,7 +260,7 @@ resource "openstack_networking_secgroup_rule_v2" "https-out" {
260260
port_range_min = 443
261261
port_range_max = 443
262262
remote_ip_prefix = "0.0.0.0/0"
263-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
263+
security_group_id = openstack_networking_secgroup_v2.security_group.id
264264
}
265265
resource "openstack_networking_secgroup_rule_v2" "https-in" {
266266
direction = "ingress"
@@ -269,7 +269,7 @@ resource "openstack_networking_secgroup_rule_v2" "https-in" {
269269
port_range_min = 443
270270
port_range_max = 443
271271
remote_ip_prefix = "0.0.0.0/0"
272-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
272+
security_group_id = openstack_networking_secgroup_v2.security_group.id
273273
}
274274
resource "openstack_networking_secgroup_rule_v2" "k8s-api-in-pa-vpn" {
275275
direction = "ingress"
@@ -278,7 +278,7 @@ resource "openstack_networking_secgroup_rule_v2" "k8s-api-in-pa-vpn" {
278278
port_range_min = 6444
279279
port_range_max = 6444
280280
remote_ip_prefix = "193.166.83.0/24"
281-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
281+
security_group_id = openstack_networking_secgroup_v2.security_group.id
282282
}
283283
resource "openstack_networking_secgroup_rule_v2" "aux-k8s-portsp-in" {
284284
direction = "ingress"
@@ -287,7 +287,7 @@ resource "openstack_networking_secgroup_rule_v2" "aux-k8s-portsp-in" {
287287
port_range_min = 30001
288288
port_range_max = 30004
289289
remote_ip_prefix = "0.0.0.0/0"
290-
security_group_id = "${openstack_networking_secgroup_v2.security_group.id}"
290+
security_group_id = openstack_networking_secgroup_v2.security_group.id
291291
}
292292

293293
resource "openstack_networking_secgroup_rule_v2" "icinga-api-in" {
@@ -309,9 +309,9 @@ resource "openstack_networking_secgroup_rule_v2" "icmp-in" {
309309
}
310310
# Subnet for the VM. On Pouta all VMs need to be in subnets to boot properly
311311
resource "openstack_networking_subnet_v2" "instance_subnet" {
312-
name = "${var.instance_name}-subnet"
313-
network_id = "${openstack_networking_network_v2.instance_net.id}"
314-
cidr = "10.0.0.0/24"
312+
name = "${var.instance_name}-subnet"
313+
network_id = openstack_networking_network_v2.instance_net.id
314+
cidr = "10.0.0.0/24"
315315
ip_version = 4
316316
dns_nameservers = [
317317
"1.1.1.1",
@@ -321,7 +321,7 @@ resource "openstack_networking_subnet_v2" "instance_subnet" {
321321

322322
# Handy output to get the IP address that we've got in the output
323323
output "address" {
324-
value = "${openstack_networking_floatingip_v2.ip.address}"
324+
value = openstack_networking_floatingip_v2.ip.address
325325
}
326326
output "cloud-init" {
327327
value = local.cloud_init

0 commit comments

Comments
 (0)