diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml index 0fb4fb704d..e365351ed5 100644 --- a/ansible-role-requirements.yml +++ b/ansible-role-requirements.yml @@ -23,12 +23,6 @@ version: master trackbranch: master shallow_since: '2024-11-27' -- name: qdrouterd - scm: git - src: https://opendev.org/openstack/ansible-role-qdrouterd - version: master - trackbranch: master - shallow_since: '2024-11-27' - name: systemd_mount src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git diff --git a/doc/source/user/messaging/messaging.rst b/doc/source/user/messaging/messaging.rst index 1712680e7e..49cdddec86 100644 --- a/doc/source/user/messaging/messaging.rst +++ b/doc/source/user/messaging/messaging.rst @@ -5,8 +5,7 @@ Hybrid messaging example This section provides an overview of hybrid messaging deployment concepts and describes the necessary steps for a working OpenStack-Ansible (OSA) deployment where RPC and Notify communications -are separated and integrated with different messaging server backends -(e.g. rabbitmq and qdrouterd). +are separated and integrated with different messaging server backends. oslo.messaging library ---------------------- @@ -67,8 +66,6 @@ support. +================+===========+===========+=====+========+===========+ | rabbit | AMQP V0.9 | rabbitmq | yes | yes | queue | +----------------+-----------+-----------+-----+--------+-----------+ - | amqp | AMQP V1.0 | qdrouterd | yes | | direct | - +----------------+-----------+-----------+-----+--------+-----------+ | kafka | kafka | kafka | | yes | queue | | (experimental) | binary | | | | (stream) | +----------------+-----------+-----------+-----+--------+-----------+ @@ -90,18 +87,3 @@ to the rabbitmq server backend. :start-after: under the License. .. _oslo-messaging.yml: https://github.com/openstack/openstack-ansible/blob/master/inventory/group_vars/all/oslo-messaging.yml - -Hybrid messaging deployment with qdrouterd server -------------------------------------------------- - -In OSA, the deployment of disparate messaging backends is completely -transparent to the OpenStack services. By managing the inventories for -the messaging servers, a hybrid messaging configuration will be created. -The instantiation of the qdrouterd server role in the -qdrouterd_host_group will automatically setup the oslomsg_rpc* -variables to use this messaging backend. No additional configuration -is required. The result is that RPC services will communicate via the -amqp (V1.0 protocol) driver and the Notify services will communicate -via the rabbit driver. The separation and use of different messaging -backends can provide increased scale and resiliency. - diff --git a/etc/openstack_deploy/conf.d/qdrouterd.yml.aio b/etc/openstack_deploy/conf.d/qdrouterd.yml.aio deleted file mode 100644 index 2dffdfab52..0000000000 --- a/etc/openstack_deploy/conf.d/qdrouterd.yml.aio +++ /dev/null @@ -1,3 +0,0 @@ -oslomsg-rpc_hosts: - aio1: - ip: 172.29.236.100 diff --git a/etc/openstack_deploy/env.d/aio_metal.yml.example b/etc/openstack_deploy/env.d/aio_metal.yml.example index 7664e8196e..091c223a40 100644 --- a/etc/openstack_deploy/env.d/aio_metal.yml.example +++ b/etc/openstack_deploy/env.d/aio_metal.yml.example @@ -102,9 +102,6 @@ container_skel: repo_container: properties: is_metal: true - qdrouterd_container: - properties: - is_metal: true rabbit_mq_container: properties: is_metal: true diff --git a/inventory/env.d/qdrouterd.yml b/inventory/env.d/qdrouterd.yml deleted file mode 100644 index 38f38ef18c..0000000000 --- a/inventory/env.d/qdrouterd.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -# Copyright 2018, Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -component_skel: - qdrouterd: - belongs_to: - - qdrouterd_all - - -container_skel: - qdrouterd_container: - belongs_to: - - oslomsg-rpc_containers - contains: - - qdrouterd - - -physical_skel: - oslomsg-rpc_containers: - belongs_to: - - all_containers - oslomsg-rpc_hosts: - belongs_to: - - hosts diff --git a/inventory/group_vars/all/infra.yml b/inventory/group_vars/all/infra.yml index cf1f39ee5d..6ed829bb2b 100644 --- a/inventory/group_vars/all/infra.yml +++ b/inventory/group_vars/all/infra.yml @@ -57,15 +57,3 @@ memcached_servers: >- | list | join(',') }} - -## Qdrouterd options -qdrouterd_host_group: "qdrouterd_all" -qdrouterd_port: "{{ (qdrouterd_use_ssl | bool) | ternary(31459, 31460) }}" - -qdrouterd_use_ssl: False -qdrouterd_servers: >- - {{ - groups[qdrouterd_host_group] - | map('extract', hostvars, 'management_address') - | list | join(',') - }} diff --git a/inventory/group_vars/all/oslo-messaging.yml b/inventory/group_vars/all/oslo-messaging.yml index 136726a89d..517b296af5 100644 --- a/inventory/group_vars/all/oslo-messaging.yml +++ b/inventory/group_vars/all/oslo-messaging.yml @@ -20,11 +20,11 @@ oslomsg_rabbit_quorum_queues: "{{ rabbitmq_queue_replication }}" oslomsg_rabbit_queue_manager: False # RPC -oslomsg_rpc_transport: "{{ (groups[qdrouterd_host_group] | length > 0) | ternary('amqp', 'rabbit') }}" -oslomsg_rpc_port: "{{ (groups[qdrouterd_host_group] | length > 0) | ternary(qdrouterd_port, rabbitmq_port) }}" -oslomsg_rpc_servers: "{{ (groups[qdrouterd_host_group] | length > 0) | ternary(qdrouterd_servers, rabbitmq_servers) }}" -oslomsg_rpc_use_ssl: "{{ (groups[qdrouterd_host_group] | length > 0) | ternary(qdrouterd_use_ssl, rabbitmq_use_ssl) }}" -oslomsg_rpc_host_group: "{{ (groups[qdrouterd_host_group] | length > 0) | ternary(qdrouterd_host_group, rabbitmq_host_group) }}" +oslomsg_rpc_transport: 'rabbit' +oslomsg_rpc_port: "{{ rabbitmq_port }}" +oslomsg_rpc_servers: "{{ rabbitmq_servers }}" +oslomsg_rpc_use_ssl: "{{ rabbitmq_use_ssl }}" +oslomsg_rpc_host_group: "{{ rabbitmq_host_group }}" oslomsg_rpc_policies: "{{ rabbitmq_policies }}" # Notify diff --git a/inventory/inventory.ini b/inventory/inventory.ini index a631d6e7f1..e65beb4021 100644 --- a/inventory/inventory.ini +++ b/inventory/inventory.ini @@ -19,8 +19,6 @@ hosts [memcached] -[qdrouterd_all] - [rabbitmq_all] [repo_all] diff --git a/playbooks/qdrouterd-install.yml b/playbooks/qdrouterd-install.yml deleted file mode 100644 index aab0770813..0000000000 --- a/playbooks/qdrouterd-install.yml +++ /dev/null @@ -1,57 +0,0 @@ ---- -# Copyright 2018, Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- name: Gather qdrouterd facts - hosts: "{{ qdrouterd_host_group | default('qdrouterd_all') }}" - gather_facts: "{{ osa_gather_facts | default(True) }}" - tags: - - always - -- name: Create and configure qdrouterd container - hosts: "{{ qdrouterd_host_group | default('qdrouterd_all') }}" - serial: "{{ qdrouterd_serial | default(1) }}" - gather_facts: false - user: root - environment: "{{ deployment_environment_variables | default({}) }}" - tags: - - qdrouterd - pre_tasks: - - name: Including container-setup tasks - include_role: - name: "openstack.osa.{{ container_tech | default('lxc') }}_container_setup" - vars: - extra_container_config_no_restart: - - "lxc.start.order=19" - when: not is_metal - - - name: Including unbound-clients tasks - include_role: - name: openstack.osa.unbound_clients - when: - - hostvars['localhost']['resolvconf_enabled'] | bool - roles: - - role: "openstack.osa.system_crontab_coordination" - - -- name: Install qdrouterd server - hosts: "{{ qdrouterd_host_group | default('qdrouterd_all') }}" - serial: 20% - user: root - gather_facts: false - environment: "{{ deployment_environment_variables | default({}) }}" - tags: - - qdrouterd - roles: - - role: "qdrouterd" diff --git a/tests/test_inventory.py b/tests/test_inventory.py index ed8fd0001a..7145121ce4 100644 --- a/tests/test_inventory.py +++ b/tests/test_inventory.py @@ -415,13 +415,7 @@ class TestAnsibleInventoryFormatConstraints(unittest.TestCase): 'orchestration_hosts', 'os-infra_containers', 'os-infra_hosts', - 'oslomsg-rpc_all', - 'oslomsg-rpc_containers', - 'oslomsg-rpc_hosts', 'pkg_repo', - 'qdrouterd', - 'qdrouterd_all', - 'qdrouterd_container', 'rabbit_mq_container', 'rabbitmq', 'rabbitmq_all', diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index b261707bbc..3bf94add31 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -90,7 +90,6 @@ - name: openstack/openstack-ansible-os_tempest - name: openstack/openstack-ansible-os_trove - name: openstack/openstack-ansible-plugins - - name: openstack/ansible-role-qdrouterd - name: openstack/openstack-ansible-rabbitmq_server - name: openstack/openstack-ansible-repo_server - name: openstack/ansible-role-systemd_service @@ -205,7 +204,6 @@ - name: openstack/openstack-ansible-os_tempest - name: openstack/openstack-ansible-os_trove - name: openstack/openstack-ansible-plugins - - name: openstack/ansible-role-qdrouterd - name: openstack/openstack-ansible-rabbitmq_server - name: openstack/openstack-ansible-repo_server - name: openstack/ansible-role-systemd_service @@ -468,11 +466,6 @@ parent: openstack-ansible-deploy-aio nodeset: ubuntu-noble -- job: - name: openstack-ansible-deploy-aio_qdrouterd-ubuntu-noble - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-noble - - job: name: openstack-ansible-deploy-translations-ubuntu-noble parent: openstack-ansible-deploy-aio @@ -622,11 +615,6 @@ parent: openstack-ansible-deploy-aio nodeset: ubuntu-jammy -- job: - name: openstack-ansible-deploy-aio_qdrouterd-ubuntu-jammy - parent: openstack-ansible-deploy-aio - nodeset: ubuntu-jammy - - job: name: openstack-ansible-deploy-translations-ubuntu-jammy parent: openstack-ansible-deploy-aio diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 582007c951..d6694aa430 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -35,7 +35,6 @@ - openstack-ansible-deploy-translations-ubuntu-jammy experimental: jobs: - - openstack-ansible-deploy-aio_qdrouterd-ubuntu-jammy - openstack-ansible-deploy_with_ansible_devel-aio-ubuntu-jammy - openstack-ansible-deploy_with_ansible_next-aio-ubuntu-jammy