diff --git a/environments/skeleton/{{cookiecutter.environment}}/README.md b/environments/skeleton/{{cookiecutter.environment}}/README.md index 202ca677c..89fe6b4af 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/README.md +++ b/environments/skeleton/{{cookiecutter.environment}}/README.md @@ -2,4 +2,4 @@ {{ cookiecutter.description }} -See the main README.md in the repo root for an overview and general install instructions. Any environment-specific instructions should be added here. \ No newline at end of file +See the main README.md in the repository root for an overview and general install instructions. Any environment-specific instructions should be added here. diff --git a/environments/skeleton/{{cookiecutter.environment}}/activate b/environments/skeleton/{{cookiecutter.environment}}/activate index 2a58b40e4..c9bb52780 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/activate +++ b/environments/skeleton/{{cookiecutter.environment}}/activate @@ -18,5 +18,3 @@ echo "Setting PKR_VAR_repo_root to $PKR_VAR_repo_root" if [ -f "$APPLIANCES_ENVIRONMENT_ROOT/ansible.cfg" ]; then export ANSIBLE_CONFIG=$APPLIANCES_ENVIRONMENT_ROOT/ansible.cfg fi - - diff --git a/environments/skeleton/{{cookiecutter.environment}}/inventory/group_vars/all/grafana.yml b/environments/skeleton/{{cookiecutter.environment}}/inventory/group_vars/all/grafana.yml index 521616a1b..14fefa945 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/inventory/group_vars/all/grafana.yml +++ b/environments/skeleton/{{cookiecutter.environment}}/inventory/group_vars/all/grafana.yml @@ -1 +1 @@ -grafana_auth_anonymous: true \ No newline at end of file +grafana_auth_anonymous: true diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/additional.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/additional.tf index 1f7c48ce5..ab44b6cec 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/additional.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/additional.tf @@ -12,7 +12,7 @@ module "additional" { cluster_domain_suffix = var.cluster_domain_suffix key_pair = var.key_pair environment_root = var.environment_root - + # can be set for group, defaults to top-level value: image_id = lookup(each.value, "image_id", var.cluster_image_id) vnic_types = lookup(each.value, "vnic_types", var.vnic_types) @@ -21,7 +21,7 @@ module "additional" { root_volume_type = lookup(each.value, "root_volume_type", var.root_volume_type) gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip) nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template) - + # optionally set for group: networks = concat(var.cluster_networks, lookup(each.value, "extra_networks", [])) # here null means "use module var default" diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf index 4e6186e35..22c7e7800 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/compute.tf @@ -12,7 +12,7 @@ module "compute" { cluster_domain_suffix = var.cluster_domain_suffix key_pair = var.key_pair environment_root = var.environment_root - + # can be set for group, defaults to top-level value: image_id = lookup(each.value, "image_id", var.cluster_image_id) vnic_types = lookup(each.value, "vnic_types", var.vnic_types) @@ -38,7 +38,7 @@ module "compute" { control_address = openstack_networking_port_v2.control[var.cluster_networks[0].network].all_fixed_ips[0] security_group_ids = [for o in data.openstack_networking_secgroup_v2.nonlogin: o.id] baremetal_nodes = data.external.baremetal_nodes.result - + # input dict validation: group_name = each.key group_keys = keys(each.value) diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf index 2c7174452..6b309c26c 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/control.tf @@ -37,12 +37,12 @@ resource "openstack_networking_port_v2" "control" { } resource "openstack_compute_instance_v2" "control" { - + name = split(".", local.control_fqdn)[0] image_id = var.cluster_image_id flavor_name = var.control_node_flavor key_pair = var.key_pair - + # root device: block_device { uuid = var.cluster_image_id @@ -81,7 +81,7 @@ resource "openstack_compute_instance_v2" "control" { user_data = <<-EOF #cloud-config fqdn: ${local.control_fqdn} - + bootcmd: %{for volume in local.control_volumes} - BLKDEV=$(readlink -f $(ls /dev/disk/by-id/*${substr(volume.id, 0, 20)}* | head -n1 )); blkid -o value -s TYPE $BLKDEV || mke2fs -t ext4 -L ${lower(reverse(split("-", volume.name))[0])} $BLKDEV diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf index b8abe4ea3..36d862b86 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/login.tf @@ -12,7 +12,7 @@ module "login" { cluster_domain_suffix = var.cluster_domain_suffix key_pair = var.key_pair environment_root = var.environment_root - + # can be set for group, defaults to top-level value: image_id = lookup(each.value, "image_id", var.cluster_image_id) vnic_types = lookup(each.value, "vnic_types", var.vnic_types) @@ -21,7 +21,7 @@ module "login" { root_volume_type = lookup(each.value, "root_volume_type", var.root_volume_type) gateway_ip = lookup(each.value, "gateway_ip", var.gateway_ip) nodename_template = lookup(each.value, "nodename_template", var.cluster_nodename_template) - + # optionally set for group: networks = concat(var.cluster_networks, lookup(each.value, "extra_networks", [])) # here null means "use module var default" diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf index 818dd95ab..e2dc1dd33 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/nodes.tf @@ -12,7 +12,7 @@ locals { # Workaround for lifecycle meta-argument only taking static values compute_instances = var.ignore_image_changes ? openstack_compute_instance_v2.compute_fixed_image : openstack_compute_instance_v2.compute - + # Define fully qualified nodenames here to avoid repetition fqdns = { for n in var.nodes: n => templatestring( @@ -61,7 +61,7 @@ resource "openstack_networking_port_v2" "compute" { subnet_id = data.openstack_networking_subnet_v2.subnet[each.value.net.network].id ip_address = try(var.ip_addresses[each.value.net.network][each.value.node_idx], null) } - + no_security_groups = lookup(each.value.net, "no_security_groups", false) security_group_ids = lookup(each.value.net, "no_security_groups", false) ? [] : var.security_group_ids @@ -128,7 +128,7 @@ resource "openstack_compute_instance_v2" "compute_fixed_image" { resource "openstack_compute_instance_v2" "compute" { for_each = var.ignore_image_changes ? [] : toset(var.nodes) - + name = split(".", local.fqdns[each.key])[0] image_id = var.image_id flavor_name = var.flavor @@ -146,7 +146,7 @@ resource "openstack_compute_instance_v2" "compute" { delete_on_termination = true } } - + dynamic "network" { for_each = {for net in var.networks: net.network => net} content { diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf index 44c862fe5..2ee95ed03 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/node_group/variables.tf @@ -181,7 +181,7 @@ variable "group_keys" { error_message = <<-EOT Node group '${var.group_name}' contains invalid key(s) ${ join(", ", setsubtract(var.group_keys, var.allowed_keys))}. - + Valid keys are ${join(", ", var.allowed_keys)}. EOT } diff --git a/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf index 592119c39..0f18a10a3 100644 --- a/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf +++ b/environments/skeleton/{{cookiecutter.environment}}/tofu/variables.tf @@ -145,7 +145,7 @@ variable "additional_nodegroups" { Keys are names of groups. Values are a mapping as for the "login" variable, with the addition of the optional entry: - + security_group_ids: List of strings giving IDs of security groups to apply. If not specified the groups from the variable nonlogin_security_groups are applied.