Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ceph_orch_apply: code change for clarity (backport #291) #294

Merged
merged 1 commit into from
May 17, 2024
Merged

ceph_orch_apply: code change for clarity (backport #291) #294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions library/ceph_orch_apply.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,21 +91,6 @@ def retrieve_current_spec(module: AnsibleModule, expected_spec: Dict) -> Dict:
return yaml.safe_load(out[1])


def change_required(current: Dict, expected: Dict) -> bool:
""" checks if the current config differs from what is expected """
if not current:
return True

for key, value in expected.items():
if key in current:
if current[key] != value:
return True
continue
else:
return True
return False


def apply_spec(module: "AnsibleModule",
data: str) -> Tuple[int, List[str], str, str]:
cmd = build_base_cmd_orch(module)
Expand Down Expand Up @@ -152,7 +137,7 @@ def run_module() -> None:
expected = parse_spec(module.params.get('spec'))
current_spec = retrieve_current_spec(module, expected)

if change_required(current_spec, expected):
if not current_spec or current_spec != expected:
rc, cmd, out, err = apply_spec(module, spec)
changed = True
else:
Expand Down
Loading