Skip to content

Commit 510cfd0

Browse files
committed
extend cookiecutter terraform config for compute init script
1 parent 9a07ff4 commit 510cfd0

File tree

4 files changed

+25
-3
lines changed

4 files changed

+25
-3
lines changed

environments/skeleton/{{cookiecutter.environment}}/terraform/compute.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,6 @@ module "compute" {
1818
k3s_token = var.k3s_token
1919
control_address = [for n in openstack_compute_instance_v2.control["control"].network: n.fixed_ip_v4 if n.access_network][0]
2020
security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id]
21+
22+
compute_init_enable = var.compute_init_enable
2123
}

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/nodes.tf

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,16 @@ resource "openstack_compute_instance_v2" "compute" {
4545
}
4646

4747
metadata = {
48-
environment_root = var.environment_root
49-
k3s_token = var.k3s_token
50-
control_address = var.control_address
48+
environment_root = var.environment_root
49+
k3s_token = var.k3s_token
50+
control_address = var.control_address
51+
enable_compute = contains(var.compute_init_enable, "compute")
52+
enable_resolv_conf = contains(var.compute_init_enable, "resolv_conf")
53+
enable_etc_hosts = contains(var.compute_init_enable, "etc_hosts")
54+
enable_nfs = contains(var.compute_init_enable, "nfs")
55+
enable_manila = contains(var.compute_init_enable, "manila")
56+
enable_basic_users = contains(var.compute_init_enable, "basic_users")
57+
enable_eessi = contains(var.compute_init_enable, "eessi")
5158
}
5259

5360
user_data = <<-EOF

environments/skeleton/{{cookiecutter.environment}}/terraform/compute/variables.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,9 @@ variable "control_address" {
7676
description = "Name/address of control node"
7777
type = string
7878
}
79+
80+
variable "compute_init_enable" {
81+
type = list(string)
82+
description = "Groups to activate for ansible-init compute rebuilds"
83+
default = []
84+
}

environments/skeleton/{{cookiecutter.environment}}/terraform/variables.tf

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ variable "compute" {
5252
image_id: Overrides variable cluster_image_id
5353
vnic_type: Overrides variable vnic_type
5454
vnic_profile: Overrides variable vnic_profile
55+
compute_init_enable: Toggles ansible-init rebuild
5556
EOF
5657
}
5758

@@ -136,3 +137,9 @@ variable "k3s_token" {
136137
description = "K3s cluster authentication token, set automatically by Ansible"
137138
type = string
138139
}
140+
141+
variable "compute_init_enable" {
142+
type = list(string)
143+
description = "Groups to activate for ansible-init compute rebuilds"
144+
default = []
145+
}

0 commit comments

Comments
 (0)