Fix set_fact on the CephMgrAnsibleVars
The purpose of this patch is react on the issue generated by [1], where an empty dict sect_fact is not allowed for ansible >= 2.11. For this reason, we're going to always set those variables and defer to the ansible layer the evaluation of the DashboardEnabled condition. [1] https://github.com/ansible/ansible/pull/73684 Closes-Bug: #1949033 Change-Id: I4ab2d20df22bdc9b140019f90d1370ef17f09294
This commit is contained in:
parent
fc1c186310
commit
b3863568ad
@ -114,24 +114,22 @@ outputs:
|
||||
external_deploy_tasks:
|
||||
list_concat:
|
||||
- {get_attr: [CephBase, role_data, external_deploy_tasks]}
|
||||
- - name: ceph_mgr_external_deploy_init
|
||||
when: step|int == 1
|
||||
tags:
|
||||
- ceph
|
||||
block:
|
||||
- name: set tripleo-ansible ceph dashboard vars
|
||||
set_fact:
|
||||
ceph_dashboard_vars:
|
||||
if:
|
||||
- {get_param: CephEnableDashboard}
|
||||
- if:
|
||||
- internal_tls_enabled
|
||||
- map_merge:
|
||||
- {get_attr: [CephMgrAnsibleVars, value, vars]}
|
||||
- tripleo_cephadm_dashboard_crt: /etc/pki/tls/certs/ceph_dashboard.crt
|
||||
- tripleo_cephadm_dashboard_key: /etc/pki/tls/private/ceph_dashboard.key
|
||||
- tripleo_cephadm_dashboard_grafana_api_no_ssl_verify: true
|
||||
- {get_attr: [CephMgrAnsibleVars, value, vars]}
|
||||
- if:
|
||||
- {get_param: CephEnableDashboard}
|
||||
- - name: set tripleo-ansible ceph dashboard vars
|
||||
when: step|int == 1
|
||||
tags:
|
||||
- ceph
|
||||
set_fact:
|
||||
ceph_dashboard_vars:
|
||||
if:
|
||||
- internal_tls_enabled
|
||||
- map_merge:
|
||||
- {get_attr: [CephMgrAnsibleVars, value, vars]}
|
||||
- tripleo_cephadm_dashboard_crt: /etc/pki/tls/certs/ceph_dashboard.crt
|
||||
- tripleo_cephadm_dashboard_key: /etc/pki/tls/private/ceph_dashboard.key
|
||||
- tripleo_cephadm_dashboard_grafana_api_no_ssl_verify: true
|
||||
- {get_attr: [CephMgrAnsibleVars, value, vars]}
|
||||
metadata_settings:
|
||||
if:
|
||||
- internal_tls_enabled
|
||||
|
Loading…
Reference in New Issue
Block a user