Merge pull request #10036 from openshift-cherrypick-robot/cherry-pick…

…-10024-to-release-3.10 [release-3.10] Collect provider facts only if cloudprovider is set
openshift · Sep 18, 2018 · 43d7e12 · 43d7e12
2 parents 0b1a5b7 + 926ec1f
commit 43d7e12
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/playbooks/init/cluster_facts.yml b/playbooks/init/cluster_facts.yml
@@ -37,6 +37,7 @@
         https_proxy: "{{ openshift_https_proxy | default(None) }}"
         no_proxy: "{{ openshift_no_proxy | default(None) }}"
         generate_no_proxy_hosts: "{{ openshift_generate_no_proxy_hosts | default(True) }}"
+        cloudprovider: "{{ openshift_cloudprovider_kind | default(None) }}"
 
   - name: Set fact of no_proxy_internal_hostnames
     openshift_facts:

diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
@@ -1030,7 +1030,9 @@ def generate_facts(self,
         roles = local_facts.keys()
 
         defaults = self.get_defaults(roles)
-        provider_facts = self.init_provider_facts()
+        provider_facts = {}
+        if 'common' in local_facts and 'cloudprovider' in local_facts['common']:
+            provider_facts = self.init_provider_facts()
         facts = apply_provider_facts(defaults, provider_facts)
         facts = merge_facts(facts,
                             local_facts,