From 30e59998126e8255365009e36400e4c7e3abffe8 Mon Sep 17 00:00:00 2001 From: Robin Roth Date: Mon, 9 May 2016 16:55:28 +0200 Subject: [PATCH] Fix distribution_facts missing on BSD (#15780) The previous fix in #15773 only solved MacOSX, but left other BSDs broken fixes #15768 --- lib/ansible/module_utils/facts.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/ansible/module_utils/facts.py b/lib/ansible/module_utils/facts.py index d0884bced4..fa23d059b0 100644 --- a/lib/ansible/module_utils/facts.py +++ b/lib/ansible/module_utils/facts.py @@ -653,10 +653,7 @@ class Distribution(object): self.module = module def populate(self): - if self.system == 'Linux': - self.get_distribution_facts() - elif self.system == 'Darwin': - self.get_distribution_facts() + self.get_distribution_facts() return self.facts def get_distribution_facts(self): @@ -678,7 +675,7 @@ class Distribution(object): cleanedname = self.system.replace('-','') distfunc = getattr(self, 'get_distribution_'+cleanedname) distfunc() - else: + elif self.system == 'Linux': # try to find out which linux distribution this is dist = platform.dist() self.facts['distribution'] = dist[0].capitalize() or 'NA'