Browse Source

Merge pull request #8351 from mgugino-upstream-stage/re-add-crio-registries

Readd crio registry variables
Scott Dodson 7 years ago
parent
commit
dcd72faf7d
1 changed files with 4 additions and 0 deletions
  1. 4 0
      roles/container_runtime/defaults/main.yml

+ 4 - 0
roles/container_runtime/defaults/main.yml

@@ -96,3 +96,7 @@ pause_image: "{{ l_os_registry_url | regex_replace('${component}' | regex_escape
 l_required_docker_version: '1.13'
 
 l_crio_var_sock: "/var/run/crio/crio.sock"
+
+l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure_registries)) }}"
+l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
+l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"