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

Jump to bottom

Numa & fence compare fix #30302

Merged
merged 1 commit into from Oct 4, 2017
Merged

Numa & fence compare fix #30302

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions lib/ansible/modules/cloud/ovirt/ovirt_cluster.py
View file
Open in desktop
Expand Up @@ -408,11 +408,7 @@ def build_entity(self):
),
) if self.param('resilience_policy') else None,
fencing_policy=otypes.FencingPolicy(
enabled=(
self.param('fence_enabled') or
self.param('fence_skip_if_connectivity_broken') or
self.param('fence_skip_if_sd_active')
),
enabled=self.param('fence_enabled'),
skip_if_connectivity_broken=otypes.SkipIfConnectivityBroken(
enabled=self.param('fence_skip_if_connectivity_broken'),
threshold=self.param('fence_connectivity_threshold'),
Expand All @@ -422,7 +418,7 @@ def build_entity(self):
) else None,
skip_if_sd_active=otypes.SkipIfSdActive(
enabled=self.param('fence_skip_if_sd_active'),
) if self.param('fence_skip_if_sd_active') else None,
) if self.param('fence_skip_if_sd_active') is not None else None,
) if (
self.param('fence_enabled') is not None or
self.param('fence_skip_if_sd_active') is not None or
Expand All @@ -441,7 +437,7 @@ def build_entity(self):
),
) if self.param('memory_policy') else None,
ksm=otypes.Ksm(
enabled=self.param('ksm') or self.param('ksm_numa'),
enabled=self.param('ksm'),
merge_across_nodes=not self.param('ksm_numa'),
) if (
self.param('ksm_numa') is not None or
Expand Down Expand Up @@ -484,8 +480,8 @@ def update_check(self, entity):
equal(self.param('gluster'), entity.gluster_service) and
equal(self.param('virt'), entity.virt_service) and
equal(self.param('threads_as_cores'), entity.threads_as_cores) and
equal(self.param('ksm_numa'), not entity.ksm.merge_across_nodes and entity.ksm.enabled) and
equal(self.param('ksm'), entity.ksm.merge_across_nodes and entity.ksm.enabled) and
equal(self.param('ksm_numa'), not entity.ksm.merge_across_nodes) and
equal(self.param('ksm'), entity.ksm.enabled) and
equal(self.param('ha_reservation'), entity.ha_reservation) and
equal(self.param('trusted_service'), entity.trusted_service) and
equal(self.param('host_reason'), entity.maintenance_reason_required) and
Expand Down Expand Up @@ -517,7 +513,7 @@ def update_check(self, entity):
])
) and
equal(
get_id_by_name(self._connection.system_service().mac_pools_service(), self.param('mac_pool')),
get_id_by_name(self._connection.system_service().mac_pools_service(), self.param('mac_pool'), raise_error=False),
entity.mac_pool.id
)
)
Expand Down