Browse Source

OLM images: use quay for origin

Evan Cordell 6 years ago
parent
commit
f574dab4a7
1 changed files with 10 additions and 2 deletions
  1. 10 2
      roles/olm/defaults/main.yaml

+ 10 - 2
roles/olm/defaults/main.yaml

@@ -1,5 +1,13 @@
 ---
 operator_lifecycle_manager_remove: false
 operator_lifecycle_manager_install: true
-olm_operator_image: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'operator-lifecycle-manager') }}"
-olm_catalog_operator_image: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'operator-lifecycle-manager') }}"
+
+olm_image_dict:
+  origin: 'quay.io/coreos/olm'
+  openshift-enterprise: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'operator-lifecycle-manager') }}"
+catalog_image_dict:
+  origin: 'quay.io/coreos/catalog'
+  openshift-enterprise: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'operator-lifecycle-manager') }}"
+
+olm_operator_image: "{{ olm_image_dict[openshift_deployment_type] }}"
+olm_catalog_operator_image: "{{ catalog_image_dict[openshift_deployment_type] }}"