浏览代码

Merge pull request #8612 from sdodson/master

Fix dockergc images
Scott Dodson 6 年之前
父节点
当前提交
ddd54f63d2
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      roles/openshift_docker_gc/defaults/main.yml
  2. 1 0
      roles/openshift_docker_gc/meta/main.yml

+ 1 - 1
roles/openshift_docker_gc/defaults/main.yml

@@ -12,4 +12,4 @@ l_os_dockergc_reg_search_dict:
 l_os_dockergc_reg_search: "{{ l_os_dockergc_reg_search_dict[openshift_deployment_type] }}"
 l_os_dockergc_replace: "{{ openshift_docker_gc_image_dict[openshift_deployment_type] }}"
 
-openshift_docker_gc_image: "{{ l_os_registry_url | regex_replace(l_openshift_logging_search | regex_escape, l_os_dockergc_replace) }}"
+openshift_docker_gc_image: "{{ l_os_registry_url | regex_replace(l_os_dockergc_reg_search | regex_escape, l_os_dockergc_replace) }}"

+ 1 - 0
roles/openshift_docker_gc/meta/main.yml

@@ -12,3 +12,4 @@ galaxy_info:
 dependencies:
 - role: lib_openshift
 - role: lib_utils
+- role: openshift_facts