Skip to content

Commit

Permalink
ceph_key: restore file mode after a key is fetched
Browse files Browse the repository at this point in the history
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 b717b5f)
  • Loading branch information
guits committed Nov 14, 2019
1 parent 146d144 commit a0468ba
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions library/ceph_key.py
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,8 @@ def run_module():
add_file_common_args=True,
)

file_args = module.load_file_common_arguments(module.params)

# Gather module parameters in variables
state = module.params['state']
name = module.params.get('name')
Expand Down Expand Up @@ -554,6 +556,8 @@ def run_module():
file_path = os.path.join(dest + "/" + cluster +
"." + name + ".keyring")

file_args['path'] = file_path

# We allow 'present' to override any existing key
# ONLY if a secret is provided
# if not we skip the creation
Expand All @@ -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
name, file_path)
result['rc'] = rc
module.set_fs_attributes_if_different(file_args, False)
module.exit_json(**result)

rc, cmd, out, err = exec_commands(module, create_key(
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)
elif state == "update":
if not caps:
Expand Down

0 comments on commit a0468ba

Please sign in to comment.