Update recyler to lsm_registry_url

roles/openshift_control_plane/defaults/main.yml

@@ -157,7 +157,4 @@ l_core_api_list:
 - "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'))) }}"
+openshift_volume_recycler_image: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'recycler') }}"

roles/openshift_control_plane/tasks/main.yml

@@ -35,7 +35,7 @@
 
 - name: Copy recyler pod to config directory
   template:
-    src: recycler_pod.yaml
+    src: "recycler_pod.yaml.j2"
     dest: "/etc/origin/master/recycler_pod.yaml"
 
 - name: Create flexvolume directory when on atomic hosts

roles/openshift_control_plane/templates/master.yaml.v1.j2

@@ -83,10 +83,6 @@ kubernetesMasterConfig:
     - VolumeScheduling=true
 {% endif %}
   controllerArguments: {{ openshift.master.controller_args | default(None) | lib_utils_to_padded_yaml( level=2 ) }}
-    pv-recycler-pod-template-filepath-nfs:
-    - "/etc/origin/master/recycler_pod.yaml"
-    pv-recycler-pod-template-filepath-hostpath:
-    - "/etc/origin/master/recycler_pod.yaml"
 {% if openshift_is_atomic | bool %}
     flex-volume-plugin-dir:
     - "/etc/origin/kubelet-plugins/volume/exec"

roles/openshift_facts/library/openshift_facts.py

@@ -608,7 +608,11 @@ def build_controller_args(facts):
     cloud_cfg_path = os.path.join(facts['common']['config_base'],
                                   'cloudprovider')
     if 'master' in facts:
-        controller_args = {}
+        controller_args = {
+            'pv-recycler-pod-template-filepath-nfs': '/etc/origin/master/recycler_pod.yaml',
+            'pv-recycler-pod-template-filepath-hostpath': '/etc/origin/master/recycler_pod.yaml'
+        }
+
         if 'cloudprovider' in facts:
             if 'kind' in facts['cloudprovider']:
                 if facts['cloudprovider']['kind'] == 'aws':