Use variables for docker_gc image

roles/openshift_docker_gc/defaults/main.yml

@@ -1,3 +1,14 @@
 ---
 r_enable_docker_gc: "{{ openshift_crio_enable_docker_gc | default(True) }}"
 r_docker_gc_node_selectors: "{{ openshift_crio_docker_gc_node_selector | default({'runtime': 'cri-o'}) }}"
+
+openshift_docker_gc_image_dict:
+  origin:
+    image: "openshift/origin"
+    version: "{{ openshift_image_tag }}"
+  openshift-enterprise:
+    image: "openshift3/ose"
+    version: "{{ openshift_image_tag }}"
+
+openshift_docker_gc_image: "{{ openshift_docker_gc_image_dict[openshift_deployment_type]['image'] }}"
+openshift_docker_gc_version: "{{ openshift_docker_gc_image_dict[openshift_deployment_type]['version'] }}"

roles/openshift_docker_gc/tasks/main.yaml

@@ -33,3 +33,8 @@
     name: "dockergc"
     files:
     - "{{ templates_tmpdir.stdout }}/dockergc-ds.yaml"
+
+- name: Remove temp directory
+  file:
+    state: absent
+    name: "{{ templates_tmpdir.stdout }}"

roles/openshift_docker_gc/templates/dockergc-ds.yaml.j2

@@ -28,7 +28,7 @@ items:
 
         serviceAccountName: dockergc
         containers:
-        - image: openshift/origin:latest
+        - image: {{ openshift_docker_gc_image }}:{{ openshift_docker_gc_version }}
           args:
           - "ex"
           - "dockergc"