Skip to content

Commit 5310b7d

Browse files
committed
remove wider reference to terraform
1 parent 9f1b99e commit 5310b7d

File tree

9 files changed

+12
-12
lines changed

9 files changed

+12
-12
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ And generate secrets for it:
8282

8383
Create an OpenTofu variables file to define the required infrastructure, e.g.:
8484

85-
# environments/$ENV/terraform/terraform.tfvars:
85+
# environments/$ENV/tofu/tofu.tfvars:
8686

8787
cluster_name = "mycluster"
8888
cluster_net = "some_network" # *
@@ -100,12 +100,12 @@ Create an OpenTofu variables file to define the required infrastructure, e.g.:
100100
}
101101
}
102102

103-
Variables marked `*` refer to OpenStack resources which must already exist. The above is a minimal configuration - for all variables and descriptions see `environments/$ENV/terraform/terraform.tfvars`.
103+
Variables marked `*` refer to OpenStack resources which must already exist. The above is a minimal configuration - for all variables and descriptions see `environments/$ENV/tofu/tofu.tfvars`.
104104

105105
To deploy this infrastructure, ensure the venv and the environment are [activated](#create-a-new-environment) and run:
106106

107107
export OS_CLOUD=openstack
108-
cd environments/$ENV/terraform/
108+
cd environments/$ENV/tofu/
109109
tofu init
110110
tofu apply
111111

ansible/ci/retrieve_inventory.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
gather_facts: no
88
vars:
99
cluster_prefix: "{{ undef(hint='cluster_prefix must be defined') }}" # e.g. ci4005969475
10-
ci_vars_file: "{{ appliances_environment_root + '/terraform/' + lookup('env', 'CI_CLOUD') }}.tfvars"
10+
ci_vars_file: "{{ appliances_environment_root + '/tofu/' + lookup('env', 'CI_CLOUD') }}.tfvars"
1111
cluster_network: "{{ lookup('ansible.builtin.ini', 'cluster_net', file=ci_vars_file, type='properties') | trim('\"') }}"
1212
tasks:
1313
- name: Get control host IP

ansible/roles/block_devices/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This is a convenience wrapper around the ansible modules:
1111

1212
To avoid issues with device names changing after e.g. reboots, devices are identified by serial number and mounted by filesystem UUID.
1313

14-
**NB:** This role is ignored[^1] during Packer builds as block devices will not be attached to the Packer build VMs. This role is therefore deprecated and it is suggested that `cloud-init` is used instead. See e.g. `environments/skeleton/{{cookiecutter.environment}}/terraform/control.userdata.tpl`.
14+
**NB:** This role is ignored[^1] during Packer builds as block devices will not be attached to the Packer build VMs. This role is therefore deprecated and it is suggested that `cloud-init` is used instead. See e.g. `environments/skeleton/{{cookiecutter.environment}}/tofu/control.userdata.tpl`.
1515

1616
[^1]: See `environments/common/inventory/group_vars/builder/defaults.yml`
1717

ansible/roles/compute_init/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ The following roles/groups are currently fully functional:
4343
- `openhpc`: all functionality
4444

4545
The above may be enabled by setting the compute_init_enable property on the
46-
terraform compute variable.
46+
tofu compute variable.
4747

4848
# Development/debugging
4949

ansible/roles/freeipa/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Support FreeIPA in the appliance. In production use it is expected the FreeIPA s
77

88
## Usage
99
- Add hosts to the `freeipa_client` group and run (at a minimum) the `ansible/iam.yml` playbook.
10-
- Host names must match the domain name. By default (using the skeleton Terraform) hostnames are of the form `nodename.cluster_name.cluster_domain_suffix` where `cluster_name` and `cluster_domain_suffix` are Terraform variables.
10+
- Host names must match the domain name. By default (using the skeleton OpenTofu) hostnames are of the form `nodename.cluster_name.cluster_domain_suffix` where `cluster_name` and `cluster_domain_suffix` are OpenTofu variables.
1111
- Hosts discover the FreeIPA server FQDN (and their own domain) from DNS records. If DNS servers are not set this is not set from DHCP, then use the `resolv_conf` role to configure this. For example when using the in-appliance FreeIPA development server:
1212

1313
```ini
@@ -28,7 +28,7 @@ Support FreeIPA in the appliance. In production use it is expected the FreeIPA s
2828
- For production use with an external FreeIPA server, a random one-time password (OTP) must be generated when adding hosts to FreeIPA (e.g. using `ipa host-add --random ...`). This password should be set as a hostvar `freeipa_host_password`. Initial host enrolment will use this OTP to enrol the host. After this it becomes irrelevant so it does not need to be committed to git. This approach means the appliance does not require the FreeIPA administrator password.
2929
- For development use with the in-appliance FreeIPA server, `freeipa_host_password` will be automatically generated in memory.
3030
- The `control` host must define `appliances_state_dir` (on persistent storage). This is used to back-up keytabs to allow FreeIPA clients to automatically re-enrol after e.g. reimaging. Note that:
31-
- This is implemented when using the skeleton Terraform; on the control node `appliances_state_dir` defaults to `/var/lib/state` which is mounted from a volume.
31+
- This is implemented when using the skeleton OpenTofu; on the control node `appliances_state_dir` defaults to `/var/lib/state` which is mounted from a volume.
3232
- Nodes are not re-enroled by a [Slurm-driven reimage](../../collections/ansible_collections/stackhpc/slurm_openstack_tools/roles/rebuild/README.md) (as that does not run this role).
3333
- If both a backed-up keytab and `freeipa_host_password` exist, the former is used.
3434

docs/production.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ and referenced from the `site` and `production` environments, e.g.:
102102

103103
- Consider whether having (read-only) access to Grafana without login is OK. If not, remove `grafana_auth_anonymous` in `environments/$ENV/inventory/group_vars/all/grafana.yml`
104104

105-
- Modify `environments/site/terraform/nodes.tf` to provide fixed IPs for at least
105+
- Modify `environments/site/tofu/nodes.tf` to provide fixed IPs for at least
106106
the control node, and (if not using FIPs) the login node(s):
107107

108108
```

docs/upgrades.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ All other commands should be run on the Ansible deploy host.
6262

6363
1. If required, build an "extra" image with local modifications, see [docs/image-build.md](./image-build.md).
6464

65-
1. Modify your site-specific environment to use this image, e.g. via `cluster_image_id` in `environments/$SITE_ENV/terraform/variables.tf`.
65+
1. Modify your site-specific environment to use this image, e.g. via `cluster_image_id` in `environments/$SITE_ENV/tofu/variables.tf`.
6666

6767
1. Test this in your staging cluster.
6868

environments/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ typically contains all the environment specific config. It must output an ansibl
77
that conforms to the structure we expect. Providing that the inventory conforms to this
88
structure, the ansible code will still be able to interface with that inventory.
99
This allows the ansible code to be decoupled from the code that deployed the infrastructure
10-
and can therefore be tool and cloud agnostic i.e we don't care if you use terraform or ansible.
10+
and can therefore be tool and cloud agnostic i.e we don't care if you use tofu or ansible.
1111

1212
A pattern we use is to chain multiple ansible inventories to provide a crude form of inheritance. e.g
1313

environments/common/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This contains an inventory that defines variables which are common between the
44
`production` and `development` environments. It is not intended to be used in
5-
a standalone fashion to deploy infrastructure (i.e no terraform), but is instead
5+
a standalone fashion to deploy infrastructure (i.e no tofu), but is instead
66
referenced in `ansible.cfg` from the `production` and `development` configurations.
77

88
The pattern we use is that all resources referenced in the inventory

0 commit comments

Comments
 (0)