Support standalone variable names in tripleo_ceph_client
Update default variable handling in tripleo_ceph_client role. If a variable name used in standalone Ansible roles, like tripleo_nova_libvirt is used, then tripleo_ceph_client will support that variable. The following substitutions are now suported: tripleo_ceph_client_cluster | tripleo_ceph_cluster_name tripleo_ceph_client_fsid | tripleo_ceph_cluster_fsid tripleo_ceph_client_keys | tripleo_ceph_cluster_keys Also update multiple_external_ceph_clusters.yml so that it can handle if each 'multiple' item contained in the variable tripleo_ceph_cluster_multi_config has a "tripleo_ceph_cluster_" prefix as above. These changes let the role remain backwards compatible with supported examples in older versions but also allow the new conventions to be used. Change-Id: If3f2fde6a40fe3e72b16eee2d93d01aeb773966a
This commit is contained in:
parent
7898061a31
commit
c15abb9b95
@ -22,10 +22,10 @@ tripleo_ceph_client_debug: "{{ (ansible_verbosity | int) >= 2 | bool }}"
|
||||
tripleo_ceph_client_hide_sensitive_logs: true
|
||||
tripleo_ceph_client_config_home: "/etc/ceph"
|
||||
tripleo_ceph_client_fetch_dir: "{{ playbook_dir }}/ceph_client_fetch_dir"
|
||||
tripleo_ceph_client_cluster: "ceph"
|
||||
tripleo_ceph_client_fsid: ''
|
||||
tripleo_ceph_client_cluster: "{{ tripleo_ceph_cluster_name | default('ceph', true) }}"
|
||||
tripleo_ceph_client_fsid: "{{ tripleo_ceph_cluster_fsid | default('', true) }}"
|
||||
tripleo_ceph_client_mon_ips: []
|
||||
tripleo_ceph_client_keys: []
|
||||
tripleo_ceph_client_keys: "{{ tripleo_ceph_cluster_keys | default([], true) }}"
|
||||
tripleo_ceph_client_config_overrides: {}
|
||||
tripleo_ceph_client_rbd_admin_socket_path: '/var/run/ceph'
|
||||
tripleo_ceph_client_rbd_log_path: '/var/log/ceph'
|
||||
|
@ -19,9 +19,9 @@
|
||||
- name: Prepare ceph config variables
|
||||
set_fact:
|
||||
external_cluster_mon_ips: "{{ multiple.external_cluster_mon_ips }}"
|
||||
tripleo_ceph_client_fsid: "{{ multiple.fsid }}"
|
||||
tripleo_ceph_client_fsid: "{{ multiple.fsid | default(multiple.tripleo_ceph_cluster_fsid, true) }}"
|
||||
tripleo_ceph_client_cluster_network: ''
|
||||
tripleo_ceph_client_mon_ips: []
|
||||
tripleo_ceph_client_cluster: "{{ multiple.cluster }}"
|
||||
tripleo_ceph_client_cluster: "{{ multiple.cluster | default(multiple.tripleo_ceph_cluster_name, true) }}"
|
||||
tripleo_ceph_client_keys: "{{ multiple.get('keys',[]) }}"
|
||||
tripleo_ceph_client_config_overrides: "{{ multiple.get('ceph_conf_overrides',{}) }}"
|
||||
|
Loading…
Reference in New Issue
Block a user