openstack/kolla-ansible
Code Issues Proposed changes

drop qdrouterd support

Browse Source 
Change-Id: I562fa187094f212003d0b17d20675f771cf082e6
This commit is contained in:
Marcin Juszkiewicz 2022-04-08 16:52:14 +02:00
parent b744772d23
commit b540717387
25 changed files with 0 additions and 363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/group_vars/all.yml
View File

@ -469,8 +469,6 @@ prometheus_elasticsearch_exporter_port: "9108"
# Prometheus blackbox-exporter ports
prometheus_blackbox_exporter_port: "9115"
qdrouterd_port: "31459"
rabbitmq_port: "{{ '5671' if rabbitmq_enable_tls | bool else '5672' }}"
rabbitmq_management_port: "15672"
rabbitmq_cluster_port: "25672"
@ -700,7 +698,6 @@ enable_ovs_dpdk: "no"
enable_osprofiler: "no"
enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
enable_prometheus: "no"
enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
enable_redis: "no"
enable_sahara: "no"
enable_senlin: "no"
@ -808,11 +805,6 @@ rabbitmq_enable_tls: "no"
# CA certificate bundle in RabbitMQ container.
rabbitmq_cacert: "/etc/ssl/certs/{{ 'ca-certificates.crt' if kolla_base_distro in ['debian', 'ubuntu'] else 'ca-bundle.trust.crt' }}"
####################
# Qdrouterd options
####################
qdrouterd_user: "openstack"
####################
# HAProxy options
####################

3
ansible/inventory/all-in-one
View File

@ -77,9 +77,6 @@ control
[outward-rabbitmq:children]
control
[qdrouterd:children]
control
[monasca-agent:children]
compute
control

3
ansible/inventory/multinode
View File

@ -101,9 +101,6 @@ control
[outward-rabbitmq:children]
control
[qdrouterd:children]
control
[monasca-agent:children]
compute
control

41
ansible/roles/qdrouterd/defaults/main.yml
View File

@ -1,41 +0,0 @@
---
qdrouterd_services:
qdrouterd:
container_name: qdrouterd
group: qdrouterd
enabled: true
image: "{{ qdrouterd_image_full }}"
volumes: "{{ qdrouterd_default_volumes + qdrouterd_extra_volumes }}"
dimensions: "{{ qdrouterd_dimensions }}"
healthcheck: "{{ qdrouterd_healthcheck }}"
####################
# Docker
####################
qdrouterd_install_type: "{{ kolla_install_type }}"
qdrouterd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ qdrouterd_install_type }}-qdrouterd"
qdrouterd_tag: "{{ openstack_tag }}"
qdrouterd_image_full: "{{ qdrouterd_image }}:{{ qdrouterd_tag }}"
qdrouterd_dimensions: "{{ default_container_dimensions }}"
qdrouterd_enable_healthchecks: "{{ enable_container_healthchecks }}"
qdrouterd_healthcheck_interval: "{{ default_container_healthcheck_interval }}"
qdrouterd_healthcheck_retries: "{{ default_container_healthcheck_retries }}"
qdrouterd_healthcheck_start_period: "{{ default_container_healthcheck_start_period }}"
qdrouterd_healthcheck_test: ["CMD-SHELL", "healthcheck_curl http://{{ api_interface_address | put_address_in_context('url') }}:{{ qdrouterd_port }}"]
qdrouterd_healthcheck_timeout: "{{ default_container_healthcheck_timeout }}"
qdrouterd_healthcheck:
interval: "{{ qdrouterd_healthcheck_interval }}"
retries: "{{ qdrouterd_healthcheck_retries }}"
start_period: "{{ qdrouterd_healthcheck_start_period }}"
test: "{% if qdrouterd_enable_healthchecks | bool %}{{ qdrouterd_healthcheck_test }}{% else %}NONE{% endif %}"
timeout: "{{ qdrouterd_healthcheck_timeout }}"
qdrouterd_default_volumes:
- "{{ node_config_directory }}/qdrouterd/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "{{ '/etc/timezone:/etc/timezone:ro' if ansible_facts.os_family == 'Debian' else '' }}"
- "qdrouterd:/var/lib/qdrouterd/"
- "kolla_logs:/var/log/kolla/"
qdrouterd_extra_volumes: "{{ default_extra_volumes }}"

16
ansible/roles/qdrouterd/handlers/main.yml
View File

@ -1,16 +0,0 @@
---
- name: Restart qdrouterd container
vars:
service_name: "qdrouterd"
service: "{{ qdrouterd_services[service_name] }}"
become: true
kolla_docker:
action: "recreate_or_restart_container"
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
volumes: "{{ service.volumes }}"
dimensions: "{{ service.dimensions }}"
healthcheck: "{{ service.healthcheck | default(omit) }}"
when:
- kolla_action != "config"

19
ansible/roles/qdrouterd/tasks/add_sasl_user.yml
View File

@ -1,19 +0,0 @@
---
- name: Wait for qdrouterd is up
wait_for:
host: "{{ api_interface_address }}"
port: "{{ qdrouterd_port }}"
connect_timeout: 1
state: started
when:
- kolla_action != "config"
- name: Create qdrouterd sasl user
shell: >
set -o pipefail && \
echo {{ qdrouterd_password }} | \
docker exec -u root -i qdrouterd saslpasswd2 -c -p -f /var/lib/qdrouterd/qdrouterd.sasldb -u AMQP {{ qdrouterd_user }}
run_once: true
changed_when: true
when:
- kolla_action != "config"

17
ansible/roles/qdrouterd/tasks/check-containers.yml
View File

@ -1,17 +0,0 @@
---
- name: Check qdrouterd containers
become: true
kolla_docker:
action: "compare_container"
common_options: "{{ docker_common_options }}"
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
volumes: "{{ item.value.volumes }}"
dimensions: "{{ item.value.dimensions }}"
healthcheck: "{{ item.value.healthcheck | default(omit) }}"
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ qdrouterd_services }}"
notify:
- "Restart {{ item.key }} container"

1
ansible/roles/qdrouterd/tasks/check.yml
View File

@ -1 +0,0 @@
---

62
ansible/roles/qdrouterd/tasks/config.yml
View File

@ -1,62 +0,0 @@
---
- name: Ensuring config directories exist
file:
path: "{{ node_config_directory }}/{{ item.key }}"
state: "directory"
owner: "{{ config_owner_user }}"
group: "{{ config_owner_group }}"
mode: "0770"
become: true
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ qdrouterd_services }}"
- name: Copying over config.json files for services
template:
src: "{{ item.key }}.json.j2"
dest: "{{ node_config_directory }}/{{ item.key }}/config.json"
mode: "0660"
become: true
when:
- inventory_hostname in groups[item.value.group]
- item.value.enabled | bool
with_dict: "{{ qdrouterd_services }}"
notify:
- Restart qdrouterd container
- name: Copying over qdrouterd config
vars:
service: "{{ qdrouterd_services['qdrouterd'] }}"
template:
src: "{{ item }}"
dest: "{{ node_config_directory }}/qdrouterd/qdrouterd.conf"
mode: "0660"
become: true
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool
with_first_found:
- "{{ node_custom_config }}/qdrouterd/{{ inventory_hostname }}/qdrouterd.conf"
- "{{ node_custom_config }}/qdrouterd/qdrouterd.conf"
- "qdrouterd.conf.j2"
notify:
- Restart qdrouterd container
- name: Copying over qdrouterd sasl config
vars:
service: "{{ qdrouterd_services['qdrouterd'] }}"
template:
src: "{{ item }}"
dest: "{{ node_config_directory }}/qdrouterd/qdrouterd-sasl.conf"
mode: "0660"
become: true
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool
with_first_found:
- "{{ node_custom_config }}/qdrouterd/{{ inventory_hostname }}/qdrouterd-sasl.conf"
- "{{ node_custom_config }}/qdrouterd/qdrouterd-sasl.conf"
- "qdrouterd-sasl.conf.j2"
notify:
- Restart qdrouterd container

2
ansible/roles/qdrouterd/tasks/deploy-containers.yml
View File

@ -1,2 +0,0 @@
---
- import_tasks: check-containers.yml

9
ansible/roles/qdrouterd/tasks/deploy.yml
View File

@ -1,9 +0,0 @@
---
- import_tasks: config.yml
- import_tasks: check-containers.yml
- name: Flush handlers
meta: flush_handlers
- import_tasks: add_sasl_user.yml

2
ansible/roles/qdrouterd/tasks/main.yml
View File

@ -1,2 +0,0 @@
---
- include_tasks: "{{ kolla_action }}.yml"

39
ansible/roles/qdrouterd/tasks/precheck.yml
View File

@ -1,39 +0,0 @@
---
- import_role:
name: service-precheck
vars:
service_precheck_services: "{{ qdrouterd_services }}"
service_name: "{{ project_name }}"
- name: Get container facts
become: true
kolla_container_facts:
name:
- qdrouterd
register: container_facts
- name: Checking free port for Qdrouterd
wait_for:
host: "{{ api_interface_address }}"
port: "{{ qdrouterd_port }}"
connect_timeout: 1
timeout: 1
state: stopped
when:
- container_facts['qdrouterd'] is not defined
- inventory_hostname in groups['qdrouterd']
- name: Check if all qdrouterd hostnames are resolvable
vars:
nss_database: "{{ 'ahostsv4' if api_address_family == 'ipv4' else 'ahostsv6' }}"
command: "getent {{ nss_database }} {{ hostvars[item].ansible_facts.hostname }}"
changed_when: false
register: qdrouterd_hostnames
with_items: "{{ groups['qdrouterd'] }}"
- name: Check if hostname resolves to IP address of api_interface
fail:
msg: "Hostname has to resolve to IP address of api_interface"
with_items: "{{ qdrouterd_hostnames.results }}"
when:
- "item.stdout.find('api' | kolla_address(item['item'])) == -1"

3
ansible/roles/qdrouterd/tasks/pull.yml
View File

@ -1,3 +0,0 @@
---
- import_role:
role: service-images-pull

2
ansible/roles/qdrouterd/tasks/reconfigure.yml
View File

@ -1,2 +0,0 @@
---
- import_tasks: deploy.yml

6
ansible/roles/qdrouterd/tasks/stop.yml
View File

@ -1,6 +0,0 @@
---
- import_role:
name: service-stop
vars:
project_services: "{{ qdrouterd_services }}"
service_name: "{{ project_name }}"

7
ansible/roles/qdrouterd/tasks/upgrade.yml
View File

@ -1,7 +0,0 @@
---
- import_tasks: config.yml
- import_tasks: check-containers.yml
- name: Flush handlers
meta: flush_handlers

4
ansible/roles/qdrouterd/templates/qdrouterd-sasl.conf.j2
View File

@ -1,4 +0,0 @@
pwcheck_method: auxprop
auxprop_plugin: sasldb
sasldb_path: /var/lib/qdrouterd/qdrouterd.sasldb
mech_list: ANONYMOUS PLAIN

58
ansible/roles/qdrouterd/templates/qdrouterd.conf.j2
View File

@ -1,58 +0,0 @@
router {
mode: standalone
id: Router.A
workerThreads: 4
saslConfigPath: /etc/sasl2
saslConfigName: qdrouterd
}
listener {
host: {{ api_interface_address }}
port: {{ qdrouterd_port }}
role: normal
authenticatePeer: no
}
address {
prefix: unicast
distribution: closest
}
address {
prefix: exclusive
distribution: closest
}
address {
prefix: broadcast
distribution: multicast
}
address {
prefix: openstack.org/om/rpc/multicast
distribution: multicast
}
address {
prefix: openstack.org/om/rpc/unicast
distribution: closest
}
address {
prefix: openstack.org/om/rpc/anycast
distribution: balanced
}
address {
prefix: openstack.org/om/notify/multicast
distribution: multicast
}
address {
prefix: openstack.org/om/notify/unicast
distribution: closest
}
address {
prefix: openstack.org/om/notify/anycast
distribution: balanced
}
log {
module: DEFAULT
enable: info+
output: /var/log/kolla/qdrouterd/qdrouterd.log
}

29
ansible/roles/qdrouterd/templates/qdrouterd.json.j2
View File

@ -1,29 +0,0 @@
{
"command": "/usr/sbin/qdrouterd",
"config_files": [
{
"source": "{{ container_config_directory }}/qdrouterd.conf",
"dest": "/etc/qpid-dispatch/qdrouterd.conf",
"owner": "qdrouterd",
"perm": "0600"
},
{
"source": "{{ container_config_directory }}/qdrouterd-sasl.conf",
"dest": "/etc/sasl2/qdrouterd.conf",
"owner": "qdrouterd",
"perm": "0600"
}
],
"permissions": [
{
"path": "/var/lib/qdrouterd",
"owner": "qdrouterd:qdrouterd",
"recurse": true
},
{
"path": "/var/log/kolla/qdrouterd",
"owner": "qdrouterd:qdrouterd",
"recurse": true
}
]
}

2
ansible/roles/qdrouterd/vars/main.yml
View File

@ -1,2 +0,0 @@
---
project_name: "qdrouterd"

12
ansible/site.yml
View File

@ -62,7 +62,6 @@
- enable_ovn_{{ enable_ovn | bool }}
- enable_placement_{{ enable_placement | bool }}
- enable_prometheus_{{ enable_prometheus | bool }}
- enable_qdrouterd_{{ enable_qdrouterd | bool }}
- enable_rabbitmq_{{ enable_rabbitmq | bool }}
- enable_redis_{{ enable_redis | bool }}
- enable_sahara_{{ enable_sahara | bool }}
@ -512,17 +511,6 @@
role_rabbitmq_user: '{{ outward_rabbitmq_user }}',
when: enable_outward_rabbitmq | bool }
- name: Apply role qdrouterd
gather_facts: false
hosts:
- qdrouterd
- '&enable_qdrouterd_True'
serial: '{{ kolla_serial|default("0") }}'
roles:
- { role: qdrouterd,
tags: qdrouterd,
when: enable_qdrouterd | bool }
- name: Apply role etcd
gather_facts: false
hosts:

10
etc/kolla/globals.yml
View File

@ -95,15 +95,6 @@
###################
# Messaging options
###################
# Below is an example of an separate backend that provides brokerless
# messaging for oslo.messaging RPC communications
#om_rpc_transport: "amqp"
#om_rpc_user: "{{ qdrouterd_user }}"
#om_rpc_password: "{{ qdrouterd_password }}"
#om_rpc_port: "{{ qdrouterd_port }}"
#om_rpc_group: "qdrouterd"
# Whether to enable TLS for oslo.messaging communication with RabbitMQ.
#om_enable_rabbitmq_tls: "{{ rabbitmq_enable_tls | bool }}"
# CA certificate bundle in containers using oslo.messaging with RabbitMQ TLS.
@ -388,7 +379,6 @@
#enable_osprofiler: "no"
#enable_placement: "{{ enable_nova | bool or enable_zun | bool }}"
#enable_prometheus: "no"
#enable_qdrouterd: "{{ 'yes' if om_rpc_transport == 'amqp' else 'no' }}"
#enable_redis: "no"
#enable_sahara: "no"
#enable_senlin: "no"

5
etc/kolla/passwords.yml
View File

@ -210,11 +210,6 @@ gnocchi_project_id:
gnocchi_resource_id:
gnocchi_user_id:
####################
# Qdrouterd options
####################
qdrouterd_password:
####################
# RabbitMQ options
####################

3
tests/templates/inventory.j2
View File

@ -157,9 +157,6 @@ control
[outward-rabbitmq:children]
control
[qdrouterd:children]
control
[monasca-agent:children]
compute
control