openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix RabbitMQ version check always getting skipped"

Browse Source
This commit is contained in:
Zuul
2025-08-07 09:42:03 +00:00
committed by Gerrit Code Review
parent 4c6a6d997e 00f8cb4c58
commit a9f5c27109
3 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/rabbitmq/tasks/version-check.yml
View File

@@ -73,7 +73,7 @@
Otherwise, see these docs for how to pin the version of RabbitMQ:
https://docs.openstack.org/kolla-ansible/latest/reference/message-queues/rabbitmq.html#rabbitmq-versions
when: container_facts[service.container_name] is defined
when: container_facts.containers[service.container_name] is defined
delegate_to: "{{ groups[role_rabbitmq_groups] | first }}"
run_once: true

5
releasenotes/notes/fix-rabbitmq-version-check-condition-59528341299bab89.yaml Normal file
View File

@@ -0,0 +1,5 @@
---
fixes:
- |
Fixes RabbitMQ version check which would always be skipped.
`LP#2102662 <https://bugs.launchpad.net/kolla-ansible/+bug/2102662>`__

10
tests/test_kolla_container_facts.py
View File

@@ -148,6 +148,7 @@ class TestContainerFacts(base.BaseTestCase):
self.assertFalse(self.dfw.result['changed'])
self.assertEqual(self.dfw.client.containers.list.call_count, 1)
self.assertIn('my_container', self.dfw.result['containers'])
self.assertNotIn('my_container', self.dfw.result)
self.assertDictEqual(
self.fake_data['containers'][0],
self.dfw.result['containers']['my_container'])
@@ -162,6 +163,7 @@ class TestContainerFacts(base.BaseTestCase):
self.assertFalse(self.dfw.result['changed'])
self.assertIn('my_container', self.dfw.result['containers'])
self.assertNotIn('my_container', self.dfw.result)
self.assertNotIn('exited_container', self.dfw.result['containers'])
def test_get_container_all(self):
@@ -173,6 +175,7 @@ class TestContainerFacts(base.BaseTestCase):
self.assertFalse(self.dfw.result['changed'])
self.assertIn('my_container', self.dfw.result['containers'])
self.assertNotIn('my_container', self.dfw.result)
self.assertNotIn('exited_container', self.dfw.result['containers'])
def test_get_containers_env(self):
@@ -190,6 +193,7 @@ class TestContainerFacts(base.BaseTestCase):
self.assertFalse(self.dfw.result['changed'])
self.dfw.client.containers.get.assert_called_once_with('my_container')
self.assertIn('my_container', self.dfw.result['envs'])
self.assertNotIn('my_container', self.dfw.result)
self.assertEquals(self.dfw.result['envs']['my_container'], fake_env)
def test_get_containers_env_negative(self):
@@ -222,6 +226,7 @@ class TestContainerFacts(base.BaseTestCase):
self.assertFalse(self.dfw.result['changed'])
self.dfw.client.containers.get.assert_called_once_with('my_container')
self.assertIn('my_container', self.dfw.result['states'])
self.assertNotIn('my_container', self.dfw.result)
def test_get_containers_state_negative(self):
self.dfw = get_DockerFactsWorker({'name': ['fake_container'],
@@ -248,6 +253,7 @@ class TestContainerFacts(base.BaseTestCase):
self.assertFalse(self.dfw.result['changed'])
self.dfw.client.volumes.list.assert_called_once_with()
self.assertIn('my_volume', self.dfw.result['volumes'])
self.assertNotIn('my_volume', self.dfw.result)
self.assertNotIn('another_volume', self.dfw.result['volumes'])
self.assertEqual(len(self.dfw.result['volumes']), 1)
self.assertDictEqual(
@@ -268,6 +274,8 @@ class TestContainerFacts(base.BaseTestCase):
self.dfw.client.volumes.list.assert_called_once_with()
self.assertIn('my_volume', self.dfw.result['volumes'])
self.assertIn('another_volume', self.dfw.result['volumes'])
self.assertNotIn('my_volume', self.dfw.result)
self.assertNotIn('another_volume', self.dfw.result)
self.assertEqual(len(self.dfw.result['volumes']), 2)
self.assertDictEqual(
self.dfw.result['volumes']['my_volume'],
@@ -289,6 +297,8 @@ class TestContainerFacts(base.BaseTestCase):
self.dfw.client.volumes.list.assert_called_once_with()
self.assertIn('my_volume', self.dfw.result['volumes'])
self.assertIn('another_volume', self.dfw.result['volumes'])
self.assertNotIn('my_volume', self.dfw.result)
self.assertNotIn('another_volume', self.dfw.result)
self.assertDictEqual(
self.dfw.result['volumes']['my_volume'],
self.fake_data['volumes'][0])