Browse Source

Merge pull request #8592 from wjiangjay/descheduler_typo

Descheduler typo
Scott Dodson 6 years ago
parent
commit
79cb5f9b87
1 changed files with 3 additions and 3 deletions
  1. 3 3
      roles/openshift_descheduler/defaults/main.yaml

+ 3 - 3
roles/openshift_descheduler/defaults/main.yaml

@@ -7,17 +7,17 @@ openshift_descheduler_delete_config: true
 # descheduler image setup
 openshift_descheduler_image_dict:
   origin:
-    search: "origin-${version}"
+    search: "${component}"
     version: v0.5.0
   openshift-enterprise:
-    search: "${version}"
+    search: "${component}"
     version: "{{ openshift_image_tag }}"
 
 l_os_descheduler_image_search: "{{ openshift_descheduler_image_dict[openshift_deployment_type]['search'] }}"
 openshift_descheduler_image_version: "{{ openshift_descheduler_image_dict[openshift_deployment_type]['version'] }}"
 
 l_os_non_standard_reg_url: "{{ oreg_url | default(l_osm_registry_url_default) }}"
-l_os_descheduler_image: "{{ l_os_non_standard_reg_url | regex_replace('${version}' | regex_escape, l_os_logging_proxy_image_version) }}"
+l_os_descheduler_image: "{{ l_os_non_standard_reg_url | regex_replace('${version}' | regex_escape, openshift_descheduler_image_version) }}"
 openshift_descheduler_image: "{{ l_os_descheduler_image | regex_replace(l_os_descheduler_image_search | regex_escape, 'descheduler') }}"
 
 # descheduler service account setup