cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ovirt_cluster: Fix cluster cpu arch comparision (#34446)

Browse source
This commit is contained in:
Ondra Machacek 2018-01-04 13:01:58 +01:00 • committed by ansibot
parent dcc1355d54
commit 2376d02f3f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/cloud/ovirt/ovirt_cluster.py
View file

@ -529,12 +529,13 @@ class ClustersModule(BaseModule):
def update_check(self, entity): def update_check(self, entity):
sched_policy = self._get_sched_policy() sched_policy = self._get_sched_policy()
migration_policy = getattr(entity.migration, 'policy', None) migration_policy = getattr(entity.migration, 'policy', None)
cluster_cpu = getattr(entity, 'cpu', dict())
return ( return (
equal(self.param('comment'), entity.comment) and equal(self.param('comment'), entity.comment) and
equal(self.param('description'), entity.description) and equal(self.param('description'), entity.description) and
equal(self.param('switch_type'), str(entity.switch_type)) and equal(self.param('switch_type'), str(entity.switch_type)) and
equal(self.param('cpu_arch'), str(entity.cpu.architecture)) and equal(self.param('cpu_arch'), str(getattr(cluster_cpu, 'architecture', None))) and
equal(self.param('cpu_type'), entity.cpu.type) and equal(self.param('cpu_type'), getattr(cluster_cpu, 'type', None)) and
equal(self.param('ballooning'), entity.ballooning_enabled) and equal(self.param('ballooning'), entity.ballooning_enabled) and
equal(self.param('gluster'), entity.gluster_service) and equal(self.param('gluster'), entity.gluster_service) and
equal(self.param('virt'), entity.virt_service) and equal(self.param('virt'), entity.virt_service) and