ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ceph_key: restore file mode after a key is fetched 

when `import_key` is enabled, if the key already exists, it will only be
fetched using ceph cli, if the mode specified in the `ceph_key` task is
different from what is applied by the ceph cli, the mode isn't restored because
we don't call `module.set_fs_attributes_if_different()` before
`module.exit_json(**result)`

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1734513

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit b717b5f736)
pull/4758/head
Guillaume Abrioux 2019-11-14 10:30:34 +01:00
parent 146d144045
commit c6bc4c4976
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/ceph_key.py
View File

@ -505,6 +505,8 @@ def run_module():
add_file_common_args=True, add_file_common_args=True,
) )
file_args = module.load_file_common_arguments(module.params)
# Gather module parameters in variables # Gather module parameters in variables
state = module.params['state'] state = module.params['state']
name = module.params.get('name') name = module.params.get('name')
@ -554,6 +556,8 @@ def run_module():
file_path = os.path.join(dest + "/" + cluster + file_path = os.path.join(dest + "/" + cluster +
"." + name + ".keyring") "." + name + ".keyring")
file_args['path'] = file_path
# We allow 'present' to override any existing key # We allow 'present' to override any existing key
# ONLY if a secret is provided # ONLY if a secret is provided
# if not we skip the creation # if not we skip the creation
@ -565,13 +569,11 @@ def run_module():
result["stdout"] = "skipped, since {0} already exists, we only fetched the key at {1}. If you want to update a key use 'state: update'".format( # noqa E501 result["stdout"] = "skipped, since {0} already exists, we only fetched the key at {1}. If you want to update a key use 'state: update'".format( # noqa E501
name, file_path) name, file_path)
result['rc'] = rc result['rc'] = rc
module.set_fs_attributes_if_different(file_args, False)
module.exit_json(**result) module.exit_json(**result)
rc, cmd, out, err = exec_commands(module, create_key( rc, cmd, out, err = exec_commands(module, create_key(
module, result, cluster, name, secret, caps, import_key, auid, file_path, containerized)) # noqa E501 module, result, cluster, name, secret, caps, import_key, auid, file_path, containerized)) # noqa E501
file_args = module.load_file_common_arguments(module.params)
file_args['path'] = file_path
module.set_fs_attributes_if_different(file_args, False) module.set_fs_attributes_if_different(file_args, False)
elif state == "update": elif state == "update":
if not caps: if not caps: