Merge "Make get ceph_mon_ip addresses task composable network compatible"

This commit is contained in:
Zuul 2021-01-19 01:33:25 +00:00 committed by Gerrit Code Review
commit 722e2a122b
1 changed files with 5 additions and 2 deletions

View File

@ -19,12 +19,14 @@
- name: Get ceph_mon_ip addresses - name: Get ceph_mon_ip addresses
set_fact: set_fact:
tripleo_ceph_client_mon_ips: "{{ (tripleo_ceph_client_mon_ips | default([])) tripleo_ceph_client_mon_ips: "{{ (tripleo_ceph_client_mon_ips | default([]))
| union([(hostvars[item]['storage_ip'] | union([hostvars[item][tripleo_ceph_client_net]]) }}"
| default(hostvars[item]['ctlplane_ip']))]) }}"
loop: "{{ groups['ceph_mon'] | list }}" loop: "{{ groups['ceph_mon'] | list }}"
vars:
tripleo_ceph_client_net: "{{ service_net_map['ceph_mon_network'] + '_ip' }}"
when: when:
- (tripleo_enabled_services | intersect(['ceph_mon'])) and - (tripleo_enabled_services | intersect(['ceph_mon'])) and
(groups['ceph_mon'] | length > 0) (groups['ceph_mon'] | length > 0)
- name: Set external_cluster_mon_ips - name: Set external_cluster_mon_ips
set_fact: set_fact:
external_cluster_mon_ips: "{{ ceph_ansible_group_vars_clients.external_cluster_mon_ips }}" external_cluster_mon_ips: "{{ ceph_ansible_group_vars_clients.external_cluster_mon_ips }}"
@ -32,6 +34,7 @@
when: when:
- (ceph_ansible_group_vars_clients.external_cluster_mon_ips is defined) and - (ceph_ansible_group_vars_clients.external_cluster_mon_ips is defined) and
(not tripleo_enabled_services | intersect(['ceph_mon'])) (not tripleo_enabled_services | intersect(['ceph_mon']))
- name: Prepare ceph config variables - name: Prepare ceph config variables
set_fact: set_fact:
tripleo_ceph_client_fsid: "{{ ceph_ansible_group_vars_all.fsid }}" tripleo_ceph_client_fsid: "{{ ceph_ansible_group_vars_all.fsid }}"