Merge pull request #9431 from ewolinetz/ops_debugging_image_prefix

fixing image defaults for logging

roles/openshift_logging_defaults/defaults/main.yml

@@ -19,10 +19,10 @@ l_os_logging_proxy_image: "{{ l_os_non_standard_reg_url | regex_replace('${versi
 # We need to regex_replace the origin-${component} with 'oauth-proxy'
 l2_os_logging_proxy_image: "{{ l_os_logging_proxy_image | regex_replace(l_os_logging_non_standard_reg_search | regex_escape, 'oauth-proxy') }}"
 
-openshift_logging_curator_image: "{{ l_os_registry_url | regex_replace(l_openshift_logging_search | regex_escape, 'logging-curator5') }}"
-openshift_logging_elasticsearch_image: "{{ l_os_registry_url | regex_replace(l_openshift_logging_search | regex_escape, 'logging-elasticsearch5') }}"
+openshift_logging_curator_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'logging-curator5') }}"
+openshift_logging_elasticsearch_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'logging-elasticsearch5') }}"
 openshift_logging_elasticsearch_proxy_image: "{{ l2_os_logging_proxy_image }}"
-openshift_logging_fluentd_image: "{{ l_os_registry_url | regex_replace(l_openshift_logging_search | regex_escape, 'logging-fluentd') }}"
-openshift_logging_kibana_image: "{{ l_os_registry_url | regex_replace(l_openshift_logging_search | regex_escape, 'logging-kibana5') }}"
+openshift_logging_fluentd_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'logging-fluentd') }}"
+openshift_logging_kibana_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape, 'logging-kibana5') }}"
 openshift_logging_kibana_proxy_image: "{{ l2_os_logging_proxy_image }}"
 openshift_logging_mux_image: "{{ openshift_logging_fluentd_image }}"