Browse Source

Use oreg_url rather than hardcoding path

Hemant Kumar 6 years ago
parent
commit
67b92e0b9c

+ 5 - 0
roles/openshift_control_plane/defaults/main.yml

@@ -156,3 +156,8 @@ l_core_api_list:
 - "security.openshift.io"
 - "template.openshift.io"
 - "user.openshift.io"
+
+l_openshift_recycler_image_dict:
+  origin: docker.io/openshift/origin-recycler:v3.11
+  openshift-enterprise: registry.redhat.io:443/openshift3/ose-recycler:v3.11
+openshift_volume_recycler_image: "{{ l_openshift_recycler_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"

+ 1 - 1
roles/openshift_control_plane/templates/recycler_pod.yaml

@@ -10,7 +10,7 @@ spec:
   containers:
     -
       name: "recyler-container"
-      image: "docker.io/openshift/origin-recycler:v3.11"
+      image: "{{ openshift_volume_recycler_image }}"
       command:
       - "/usr/bin/openshift-recycle"
       args: