Merge "Make get ceph_mon_ip addresses task composable network compatible"
This commit is contained in:
commit
722e2a122b
@ -19,12 +19,14 @@
|
||||
- name: Get ceph_mon_ip addresses
|
||||
set_fact:
|
||||
tripleo_ceph_client_mon_ips: "{{ (tripleo_ceph_client_mon_ips | default([]))
|
||||
| union([(hostvars[item]['storage_ip']
|
||||
| default(hostvars[item]['ctlplane_ip']))]) }}"
|
||||
| union([hostvars[item][tripleo_ceph_client_net]]) }}"
|
||||
loop: "{{ groups['ceph_mon'] | list }}"
|
||||
vars:
|
||||
tripleo_ceph_client_net: "{{ service_net_map['ceph_mon_network'] + '_ip' }}"
|
||||
when:
|
||||
- (tripleo_enabled_services | intersect(['ceph_mon'])) and
|
||||
(groups['ceph_mon'] | length > 0)
|
||||
|
||||
- name: Set external_cluster_mon_ips
|
||||
set_fact:
|
||||
external_cluster_mon_ips: "{{ ceph_ansible_group_vars_clients.external_cluster_mon_ips }}"
|
||||
@ -32,6 +34,7 @@
|
||||
when:
|
||||
- (ceph_ansible_group_vars_clients.external_cluster_mon_ips is defined) and
|
||||
(not tripleo_enabled_services | intersect(['ceph_mon']))
|
||||
|
||||
- name: Prepare ceph config variables
|
||||
set_fact:
|
||||
tripleo_ceph_client_fsid: "{{ ceph_ansible_group_vars_all.fsid }}"
|
||||
|
Loading…
Reference in New Issue
Block a user