From 32cea21c0319d38852492a35395ae470844fdead Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Thu, 1 Jul 2021 21:34:21 +0300 Subject: [PATCH] Add PKI role to local a-r-r Change-Id: Ia149dce32077cfa9fdf88afcc122d34199477c75 --- meta/main.yml | 1 + templates/qdrouterd.conf.j2 | 2 +- tests/ansible-role-requirements.yml | 4 ++++ tests/group_vars/all_containers.yml | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/main.yml b/meta/main.yml index 08c2bac..4fc3ca1 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -17,6 +17,7 @@ galaxy_info: description: This role installs and configures the qpid-dispatch-router license: Apache min_ansible_version: 2.3 + role_name: qdrouterd platforms: - name: EL versions: diff --git a/templates/qdrouterd.conf.j2 b/templates/qdrouterd.conf.j2 index 76ab3c3..905e9b3 100644 --- a/templates/qdrouterd.conf.j2 +++ b/templates/qdrouterd.conf.j2 @@ -55,7 +55,7 @@ listener { {% for router in groups['qdrouterd_all'] %} {% if inventory_hostname < router %} connector { - host: {{ hostvars[router]['ansible_eth0']['ipv4']['address'] }} + host: {{ hostvars[router]['management_address'] }} role: inter-router port: {{ qdrouterd_irl_port_plain }} } diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 49618c1..c5e766b 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -15,3 +15,7 @@ src: https://opendev.org/openstack/openstack-ansible-lxc_container_create scm: git version: master +- name: pki + src: https://opendev.org/openstack/ansible-role-pki + scm: git + version: master diff --git a/tests/group_vars/all_containers.yml b/tests/group_vars/all_containers.yml index 8401d27..111c567 100644 --- a/tests/group_vars/all_containers.yml +++ b/tests/group_vars/all_containers.yml @@ -21,5 +21,6 @@ container_networks: netmask: "255.255.255.0" type: "veth" physical_host: localhost +management_address: "{{ ansible_host }}" properties: service_name: "{{ inventory_hostname }}"