openstack
/
tripleo-ansible
Code Issues Proposed changes

Merge "Fix key validation on the ceph_spec common layer"

This commit is contained in:
Zuul 2021-03-24 00:31:27 +00:00 committed by Gerrit Code Review
parent 653ca3fdc1 2075641f84
commit f83ec977c9
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tripleo_ansible/ansible_plugins/module_utils/ceph_spec.py
View File

@ -32,12 +32,14 @@ ALLOWED_EXTRA_KEYS = {
'data_devices',
'db_devices',
'wal_devices',
'encrypted'
]
}
ALLOWED_SPEC_KEYS = {
'rgw': [
'rgw_frontend_port',
'rgw_frontend_type',
'rgw_realm',
'rgw_zone',
'rgw_ip_address'
@ -46,11 +48,6 @@ ALLOWED_SPEC_KEYS = {
'namespace',
'pool'
],
'osd': [
'data_devices',
'db_devices',
'wal_devices',
],
}
@ -203,14 +200,14 @@ class CephDaemonSpec(object):
# an entry for the current daemon is not found
# no checks are required (let ceph orch take care of
# the validation
if self.daemon_type not in ALLOWED_SPEC_KEYS.keys():
if self.daemon_type not in ALLOWED_KEYS.keys():
return True
# a basic check on the spec dict: if some constraints
# are specified, the provided keys should be contained
# in the ALLOWED keys
for item in spec:
if item not in ALLOWED_SPEC_KEYS.get(self.daemon_type):
if item not in ALLOWED_KEYS.get(self.daemon_type):
return False
return True