Skip to content

Commit 4288817

Browse files
author
Dmitriy Rabotyagov
committed
Bump embedded ansible version to 10 series
Ansible 10 is based on the ansible-core 2.17 [1], which we are using for current branch. This also replaces focal job with noble as focal does not minimum requirements for Ansible 10. [1] https://docs.ansible.com/ansible/latest/porting_guides/porting_guide_10.html Change-Id: Iae331462dbfebf38134943e00562ad3349356532
1 parent da0ddb5 commit 4288817

File tree

5 files changed

+31
-36
lines changed

5 files changed

+31
-36
lines changed

‎bootstrap-embedded-ansible/ansible-requirements.yml‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
---
2-
- name: config_template
3-
scm: git
4-
src: https://opendev.org/openstack/ansible-config_template
5-
version: d97279293d09ab3cae6e20119662029d6b64b3b7
6-
- name: plugins
7-
scm: git
8-
src: https://opendev.org/openstack/openstack-ansible-plugins
9-
version: 7fd6dd21123f162091631d87bf1db8fb7700fcda
10-
- name: systemd_service
11-
scm: git
12-
src: https://opendev.org/openstack/ansible-role-systemd_service
13-
version: 86ad639f4171b0c01bba030ebc3fd96ec020aa45
14-
- name: systemd_mount
15-
scm: git
16-
src: https://opendev.org/openstack/ansible-role-systemd_mount
17-
version: master
2+
collections:
3+
- name: openstack.config_template
4+
type: git
5+
source: https://opendev.org/openstack/ansible-config_template
6+
version: 2.1.1
7+
- name: openstack.osa
8+
type: git
9+
source: https://opendev.org/openstack/openstack-ansible-plugins
10+
version: 3bd48b7c5ac27787e67a95338241988a2aaddb4f
11+
roles:
12+
- name: systemd_service
13+
scm: git
14+
src: https://opendev.org/openstack/ansible-role-systemd_service
15+
version: 86ad639f4171b0c01bba030ebc3fd96ec020aa45
16+
- name: systemd_mount
17+
scm: git
18+
src: https://opendev.org/openstack/ansible-role-systemd_mount
19+
version: master

‎bootstrap-embedded-ansible/bootstrap-embedded-ansible.sh‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,17 +89,9 @@ export ANSIBLE_ROLES_PATH="${ANSIBLE_EMBED_HOME}/repositories/roles"
8989
OPTS+=('ANSIBLE_ROLES_PATH')
9090
echo "env ANSIBLE_ROLES_PATH set"
9191

92-
export ANSIBLE_ACTION_PLUGINS="${ANSIBLE_EMBED_HOME}/repositories/roles/config_template/action"
93-
OPTS+=('ANSIBLE_ACTION_PLUGINS')
94-
echo "env ANSIBLE_ACTION_PLUGINS set"
95-
96-
export ANSIBLE_CONNECTION_PLUGINS="${ANSIBLE_EMBED_HOME}/repositories/roles/plugins/connection"
97-
OPTS+=('ANSIBLE_CONNECTION_PLUGINS')
98-
echo "env ANSIBLE_CONNECTION_PLUGINS set"
99-
100-
export ANSIBLE_STRATEGY_PLUGINS="${ANSIBLE_EMBED_HOME}/repositories/roles/plugins/strategy"
101-
OPTS+=('ANSIBLE_STRATEGY_PLUGINS')
102-
echo "env ANSIBLE_STRATEGY_PLUGINS set"
92+
export ANSIBLE_COLLECTIONS_PATH="${ANSIBLE_EMBED_HOME}/repositories"
93+
OPTS+=('ANSIBLE_COLLECTIONS_PATH')
94+
echo "env ANSIBLE_COLLECTIONS_PATH set"
10395

10496
export ANSIBLE_TRANSPORT="${ANSIBLE_TRANSPORT:-ssh}"
10597
OPTS+=('ANSIBLE_TRANSPORT')

‎elk_metrics_7x/tests/functional.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@
2626
ANSIBLE_PACKAGE: "{{ ansible_package | default('') }}"
2727
ANSIBLE_HOST_KEY_CHECKING: "False"
2828
ANSIBLE_LOG_PATH: "/tmp/elk-metrics-7x-logs/ansible-elk-test.log"
29-
ANSIBLE_ACTION_PLUGINS: "${HOME}/ansible_venv/repositories/roles/config_template/action"
30-
ANSIBLE_CONNECTION_PLUGINS: "${HOME}/ansible_venv/repositories/roles/plugins/connection"
29+
ANSIBLE_TRANSPORT: openstack.osa.ssh
30+
ANSIBLE_COLLECTIONS_PATH: "${HOME}/ansible_venv/repositories"
3131
ANSIBLE_ROLES_PATH: "${HOME}/ansible_venv/repositories/roles"
32+
ANSIBLE_VERSION: 10.7.0
3233

3334
vars:
3435
inventory_file: "inventory/test-{{ (container_inventory | bool) | ternary('container', 'metal') }}-inventory.yml"

‎zuul.d/jobs.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
# limitations under the License.
1515

1616
- job:
17-
name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-focal"
17+
name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy"
1818
parent: base
19-
nodeset: ubuntu-focal
19+
nodeset: ubuntu-jammy
2020
description: "Runs a gate test on the elk_metrics_7x project."
2121
run: "elk_metrics_7x/tests/test.yml"
2222
post-run: "elk_metrics_7x/tests/post-run.yml"
@@ -28,9 +28,9 @@
2828
test_clustered_elk: false
2929

3030
- job:
31-
name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy"
32-
parent: "openstack-ansible-ops:elk_metrics_7x-ubuntu-focal"
33-
nodeset: ubuntu-focal
31+
name: "openstack-ansible-ops:elk_metrics_7x-ubuntu-noble"
32+
parent: "openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy"
33+
nodeset: ubuntu-noble
3434

3535
- job:
3636
name: "openstack-ansible-ops:osquery-ubuntu-jammy"

‎zuul.d/project.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
check:
2121
jobs:
2222
- openstack-ansible-linters
23-
- openstack-ansible-ops:elk_metrics_7x-ubuntu-focal
2423
- openstack-ansible-ops:elk_metrics_7x-ubuntu-jammy
24+
- openstack-ansible-ops:elk_metrics_7x-ubuntu-noble
2525
- openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.29.6
2626
- openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.30.2
2727
- openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.31.1
2828
gate:
2929
jobs:
3030
- openstack-ansible-linters
31-
- openstack-ansible-ops:elk_metrics_7x-ubuntu-focal
31+
- openstack-ansible-ops:elk_metrics_7x-ubuntu-noble
3232
- openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.29.6
3333
- openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.30.2
3434
- openstack-ansible-deploy-aio_magnum_octavia_capi_kvm_ops-ubuntu-jammy-v1.31.1

0 commit comments

Comments
 (0)