| commit | 99fb1be4814a4981ecbb656ed048c9ec99d8ffc1 | [log] [tgz] |
|---|---|---|
| author | mcp-jenkins <mcp-jenkins@mirantis.com> | Mon Mar 22 13:46:43 2021 +0000 |
| committer | Gerrit Code Review <gerrit@cffb16fd602b> | Mon Mar 22 13:46:43 2021 +0000 |
| tree | f340a521c3dd1241fb395360684ba2bd01e8d958 | |
| parent | b42865306e37d18821d1c0ba2ab1b540f7c30423 [diff] | |
| parent | a62c39d408bddaacbfa46e78ae30fa5cda3d8967 [diff] |
Merge "Check common.keyring is provided before check common.keyring.admin key"
diff --git a/ceph/mon.sls b/ceph/mon.sls index b660cdf..db172b9 100644 --- a/ceph/mon.sls +++ b/ceph/mon.sls
@@ -54,7 +54,7 @@ - pkg: mon_packages - file: common_config -{%- if common.keyring.admin is not defined %} +{%- if common.get('keyring', {}).admin is not defined %} /var/lib/ceph/mon/{{ common.get('cluster_name', 'ceph') }}-{{ grains.host }}/keyring: file.managed: - source: salt://ceph/files/mon_keyring