Fix system-config-run for Ansible 9 vs 11

Ansible 11 dropped support for the python version on Ubuntu bionic. Some
of our test jobs continue to test against bionic nodes to cover
functioanlity there. Pin these jobs back to Ansible 9 so that Ansible
can speak to these test nodes

We also drop the bionic and focal image types from the mirror job
entirely because we no longer have any bionic or focal image nodes
acting as mirrors.

Change-Id: I12718599f7e252f45a625e96a0dbbbce9768d008
This commit is contained in:
Clark Boylan
2025-08-18 14:53:21 -07:00
parent 069411d752
commit 3f10b06710
7 changed files with 8 additions and 31 deletions

View File

@@ -227,12 +227,6 @@
- name: letsencrypt updated mirror02-openafs-provider-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror03-openafs-provider-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated mirror04-openafs-provider-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated gitea99-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml

View File

@@ -148,8 +148,6 @@
- host_vars/gitea99.opendev.org.yaml
- host_vars/mirror01.openafs.provider.opendev.org.yaml
- host_vars/mirror02.openafs.provider.opendev.org.yaml
- host_vars/mirror03.openafs.provider.opendev.org.yaml
- host_vars/mirror04.openafs.provider.opendev.org.yaml
- host_vars/mirror-update99.opendev.org.yaml
- host_vars/paste99.opendev.org.yaml
- host_vars/review99.opendev.org.yaml

View File

@@ -13,8 +13,6 @@ groups:
- letsencrypt02.opendev.org
- mirror01.openafs.provider.opendev.org
- mirror02.openafs.provider.opendev.org
- mirror03.openafs.provider.opendev.org
- mirror04.openafs.provider.opendev.org
borg-backup-server:
- borg-backup01.region.provider.opendev.org

View File

@@ -1,4 +0,0 @@
letsencrypt_certs:
mirror03-openafs-provider-opendev-org-main:
- mirror03.openafs.provider.opendev.org
- mirror.openafs.provider.opendev.org

View File

@@ -1,4 +0,0 @@
letsencrypt_certs:
mirror04-openafs-provider-opendev-org-main:
- mirror04.openafs.provider.opendev.org
- mirror.openafs.provider.opendev.org

View File

@@ -17,9 +17,7 @@ import json
testinfra_hosts = ['mirror01.openafs.provider.opendev.org',
'mirror02.openafs.provider.opendev.org',
'mirror03.openafs.provider.opendev.org',
'mirror04.openafs.provider.opendev.org']
'mirror02.openafs.provider.opendev.org',]
def test_apache(host):
apache = host.service('apache2')

View File

@@ -58,6 +58,8 @@
description: |
Run the "base" playbook on each of the node types
currently in use.
# Pinned for now due to Ansible 11 not supporting the Python on Bionic.
ansible-version: '9'
nodeset:
nodes:
- &bridge_node_x86 { name: bridge99.opendev.org, label: ubuntu-jammy }
@@ -96,6 +98,8 @@
parent: system-config-run-base
description: |
Run the base playbook with the latest ansible.
# Pinned for now due to Ansible 11 not supporting the Python on Bionic.
ansible-version: '9'
nodeset:
nodes:
- <<: *bridge_node_x86
@@ -368,6 +372,8 @@
parent: system-config-run
description: |
Run the playbook for borg backup configuration
# Pinned for now due to Ansible 11 not supporting the Python on Bionic.
ansible-version: '9'
nodeset:
nodes:
- <<: *bridge_node_x86
@@ -436,11 +442,6 @@
'/var/log/apache2/': logs
'/var/log/acme.sh': logs
'/etc/apache2/sites-available/mirror.conf': logs
mirror03.openafs.provider.opendev.org:
host_copy_output:
'/var/log/apache2/': logs
'/var/log/acme.sh': logs
'/etc/apache2/sites-available/mirror.conf': logs
files:
- playbooks/bootstrap-bridge.yaml
- roles/
@@ -460,12 +461,8 @@
nodes:
- <<: *bridge_node_x86
- name: mirror01.openafs.provider.opendev.org
label: ubuntu-bionic
- name: mirror02.openafs.provider.opendev.org
label: ubuntu-focal
- name: mirror03.openafs.provider.opendev.org
label: ubuntu-jammy
- name: mirror04.openafs.provider.opendev.org
- name: mirror02.openafs.provider.opendev.org
label: ubuntu-noble
groups:
- <<: *bastion_group