소스 검색

Collect provider facts only if cloudprovider is set

Vadim Rutkovsky 6 년 전
부모
커밋
6b27ef9e22
2개의 변경된 파일4개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      playbooks/init/cluster_facts.yml
  2. 3 1
      roles/openshift_facts/library/openshift_facts.py

+ 1 - 0
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:

+ 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 '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,