소스 검색

Merge pull request #660 from sdodson/updated-registry-facts

Updated registry fact with latest deployment_type mappings
Brenton Leanhardt 9 년 전
부모
커밋
3bd2ebe0ec
1개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 4 4
      roles/openshift_facts/library/openshift_facts.py

+ 4 - 4
roles/openshift_facts/library/openshift_facts.py

@@ -480,11 +480,11 @@ def set_deployment_facts_if_unset(facts):
         if role in facts:
         if role in facts:
             deployment_type = facts['common']['deployment_type']
             deployment_type = facts['common']['deployment_type']
             if 'registry_url' not in facts[role]:
             if 'registry_url' not in facts[role]:
-                registry_url = 'aos3/aos-${component}:${version}'
-                if deployment_type in ['enterprise', 'online']:
+                registry_url = 'openshift/origin-${component}:${version}'
+                if deployment_type in ['enterprise', 'online', 'openshift-enterprise']:
                     registry_url = 'openshift3/ose-${component}:${version}'
                     registry_url = 'openshift3/ose-${component}:${version}'
-                elif deployment_type == 'origin':
-                    registry_url = 'openshift/origin-${component}:${version}'
+                elif deployment_type == 'atomic-enterprise':
+                    registry_url = 'aep3/aep-${component}:${version}'
                 facts[role]['registry_url'] = registry_url
                 facts[role]['registry_url'] = registry_url
 
 
     return facts
     return facts