Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions infra/aws-ec2/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ data "aws_ami" "ubuntu_24_04" {
# Find filters in Ubuntu docs:
# https://documentation.ubuntu.com/aws/aws-how-to/instances/find-ubuntu-images/
filter {
name = "name"
values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*"]
name = "name"
# Ubuntu 24.04: "ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-*".
# Ubuntu 26.04: "ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-amd64-server-*".
values = ["ubuntu/images/hvm-ssd-gp3/ubuntu-resolute-26.04-amd64-server-*"]
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# --- used by tasks --- #
container_image: ubuntu-py:24.04
container_image: ubuntu-py:26.04
molecule_scenario_name: "{{ lookup('env', 'MOLECULE_SCENARIO_NAME') }}"
docker_network_name: "ansitofu-molecule-{{ molecule_scenario_name }}"

Expand Down
2 changes: 1 addition & 1 deletion whisperpine/ansitofu/extensions/molecule/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Ansible requires the target host to have python3 installed.
# Therefore, we build a dedicated container image for test purpose.

FROM ubuntu:24.04
FROM ubuntu:26.04

# Prevent interactive prompts during build.
ENV DEBIAN_FRONTEND="noninteractive"
Expand Down
2 changes: 1 addition & 1 deletion whisperpine/ansitofu/roles/consul/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ consul_user: "consul"
consul_group: "consul"

consul_dependencies:
- gnupg
- gnupg # required by the "ansible.builtin.apt_repository" module
- ca-certificates # required by the "ansible.builtin.get_url" module
- iproute2 # make the "hostvars[inventory_hostname].ansible_default_ipv4.address" fact be gathered

Expand Down
10 changes: 3 additions & 7 deletions whisperpine/ansitofu/roles/consul/tasks/install.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
- name: Update apt package cache
ansible.builtin.apt:
update_cache: true
cache_valid_time: 3600

- name: Install required dependencies
ansible.builtin.apt:
name: "{{ consul_dependencies }}"
state: present
update_cache: true
no_log: true

- name: Create consul group
Expand All @@ -25,12 +21,12 @@
- name: Download consul gpg key
ansible.builtin.get_url:
url: "{{ consul_gpg_url }}"
dest: /tmp/consul.asc
dest: /tmp/consul.gpg
mode: "0644"

- name: Convert consul gpg key to binary
ansible.builtin.command:
cmd: gpg --dearmor -o "{{ consul_key_file }}" /tmp/consul.asc
cmd: gpg --dearmor -o "{{ consul_key_file }}" /tmp/consul.gpg
creates: "{{ consul_key_file }}"

- name: Add HashiCorp apt repository
Expand Down
4 changes: 2 additions & 2 deletions whisperpine/ansitofu/roles/install_docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
- name: Download Docker GPG key
ansible.builtin.get_url:
url: "{{ install_docker_gpg_url }}"
dest: /tmp/docker.asc
dest: /tmp/docker.gpg
mode: "0644"

- name: Convert Docker GPG key to binary
ansible.builtin.command:
cmd: gpg --dearmor -o "{{ install_docker_key_file }}" /tmp/docker.asc
cmd: gpg --dearmor -o "{{ install_docker_key_file }}" /tmp/docker.gpg
creates: "{{ install_docker_key_file }}"

- name: Add Docker repository
Expand Down
1 change: 1 addition & 0 deletions whisperpine/ansitofu/roles/mongodb/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
mongodb_dependencies:
- gnupg # required by the "ansible.builtin.apt_repository" module
- ca-certificates # required by the "ansible.builtin.get_url" module
- iproute2 # make the "hostvars[inventory_hostname].ansible_default_ipv4.address" fact be gathered
- cron # required by the "ansible.builtin.cron" module
Expand Down
Loading