Browse Source

Merge pull request #9876 from vrutkovs/skip_provider_facts_guess

Don't fetch provider openshift_facts if openshift_cloud_provider_kind is not set
OpenShift Merge Robot 6 years ago
parent
commit
9d469a5d94
1 changed files with 3 additions and 1 deletions
  1. 3 1
      roles/openshift_facts/library/openshift_facts.py

+ 3 - 1
roles/openshift_facts/library/openshift_facts.py

@@ -1055,7 +1055,9 @@ class OpenShiftFacts(object):
         roles = local_facts.keys()
 
         defaults = self.get_defaults(roles)
-        provider_facts = self.init_provider_facts()
+        provider_facts = {}
+        if 'cloudprovider' in local_facts and 'kind' in local_facts['cloudprovider']:
+            provider_facts = self.init_provider_facts()
         facts = apply_provider_facts(defaults, provider_facts)
         facts = merge_facts(facts,
                             local_facts,