From d80189611a73aa9fdb5ec9f1f36f253963a11d02 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Sat, 20 May 2023 21:47:52 +0200
Subject: [PATCH] Add neutron-ovn-agent group to Kolla inventory
This fixes the following issue seen while pulling Neutron images, caused
by a kolla-ansible change [1] adding support for neutron-ovn-agent:
'dict object' has no attribute 'neutron-ovn-agent'
CI: Make Rocky Linux jobs non-voting to allow this to merge.
[1] https://review.opendev.org/c/openstack/kolla-ansible/+/871297
Change-Id: I9e0a315fe2c9ff91bdeffb15adcc353a20204d9a
---
ansible/roles/kolla-ansible/templates/overcloud-services.j2 | 4 ++++
zuul.d/jobs.yaml | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/ansible/roles/kolla-ansible/templates/overcloud-services.j2 b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
index 235de016..2c023d49 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -113,6 +113,10 @@ neutron
[ironic-neutron-agent:children]
neutron
+[neutron-ovn-agent:children]
+compute
+network
+
# Cinder
[cinder-api:children]
cinder
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 3b846621..aca7e52d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -128,6 +128,8 @@
name: kayobe-overcloud-rocky9
parent: kayobe-overcloud-base
nodeset: kayobe-rocky9
+ # TODO(priteau): Remove once RL9 jobs are passing
+ voting: false
- job:
name: kayobe-overcloud-ubuntu-jammy
@@ -151,6 +153,8 @@
name: kayobe-overcloud-tls-rocky9
parent: kayobe-overcloud-tls-base
nodeset: kayobe-rocky9
+ # TODO(priteau): Remove once RL9 jobs are passing
+ voting: false
- job:
name: kayobe-overcloud-upgrade-base
@@ -168,6 +172,8 @@
name: kayobe-overcloud-upgrade-rocky9
parent: kayobe-overcloud-upgrade-base
nodeset: kayobe-rocky9
+ # TODO(priteau): Remove once RL9 jobs are passing
+ voting: false
- job:
name: kayobe-overcloud-upgrade-ubuntu-jammy
--
GitLab