Skip to content

Commit 253cf94

Browse files
committed
fix linter whinges
1 parent ec3dc53 commit 253cf94

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cluster_net = "portal-internal"
2-
cluster_subnet = "portal-internal"
1+
cluster_net = "portal-internal"
2+
cluster_subnet = "portal-internal"
33
control_node_flavor = "vm.ska.cpu.general.eighth"
4-
other_node_flavor = "vm.ska.cpu.general.small"
4+
other_node_flavor = "vm.ska.cpu.general.small"
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cluster_networks = [
2-
{
3-
network = "stackhpc-dev"
4-
subnet = "stackhpc-dev"
5-
}
2+
{
3+
network = "stackhpc-dev"
4+
subnet = "stackhpc-dev"
5+
}
66
]
77
control_node_flavor = "ec1.medium" # small ran out of memory, medium gets down to ~100Mi mem free on deployment
8-
other_node_flavor = "en1.xsmall"
9-
state_volume_type = "unencrypted"
10-
home_volume_type = "unencrypted"
8+
other_node_flavor = "en1.xsmall"
9+
state_volume_type = "unencrypted"
10+
home_volume_type = "unencrypted"
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
cluster_networks = [
2-
{
3-
network = "slurmapp-ci"
4-
subnet = "slurmapp-ci"
5-
}
2+
{
3+
network = "slurmapp-ci"
4+
subnet = "slurmapp-ci"
5+
}
66
]
77
control_node_flavor = "ec1.medium" # small ran out of memory, medium gets down to ~100Mi mem free on deployment
8-
other_node_flavor = "en1.xsmall"
9-
state_volume_type = "unencrypted"
10-
home_volume_type = "unencrypted"
8+
other_node_flavor = "en1.xsmall"
9+
state_volume_type = "unencrypted"
10+
home_volume_type = "unencrypted"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
cluster_networks = [
2-
{
3-
network = "stackhpc-ipv4-geneve"
4-
subnet = "stackhpc-ipv4-geneve-subnet"
5-
}
2+
{
3+
network = "stackhpc-ipv4-geneve"
4+
subnet = "stackhpc-ipv4-geneve-subnet"
5+
}
66
]
77
control_node_flavor = "general.v1.small"
8-
other_node_flavor = "general.v1.small"
8+
other_node_flavor = "general.v1.small"

environments/site/tofu/variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ variable "login" {
8989

9090
type = any
9191
validation {
92-
condition = length(setintersection(keys(var.login), ["login", "compute", "control"])) == 0
92+
condition = length(setintersection(keys(var.login), ["login", "compute", "control"])) == 0
9393
error_message = <<-EOF
9494
Login nodegroup names cannot be 'login', 'compute' or 'control'. Invalid var.login key(s): ${join(", ", setintersection(keys(var.login), ["login", "compute", "control"]))}.
9595
EOF
@@ -147,13 +147,13 @@ variable "compute" {
147147

148148
type = any # can't do any better; TF type constraints can't cope with heterogeneous inner mappings
149149
validation {
150-
condition = length(setintersection(keys(var.compute), ["login", "compute", "control", "default"])) == 0
150+
condition = length(setintersection(keys(var.compute), ["login", "compute", "control", "default"])) == 0
151151
error_message = <<-EOF
152152
Compute nodegroup names cannot be 'compute', 'default', 'login' or 'control'. Invalid var.compute key(s): ${join(", ", setintersection(keys(var.compute), ["login", "compute", "control", "default"]))}.
153153
EOF
154154
}
155155
validation {
156-
condition = length(setintersection(keys(var.compute), keys(var.login))) == 0
156+
condition = length(setintersection(keys(var.compute), keys(var.login))) == 0
157157
error_message = <<-EOF
158158
Compute and login nodegroups cannot have the same name. Invalid var.compute/var.login key(s): ${join(", ", setintersection(keys(var.compute), keys(var.login)))}
159159
EOF

0 commit comments

Comments
 (0)