diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-09-27 12:03:43 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-09-27 12:06:32 -0400 |
| commit | 9d6e86c0217c97d33aecdcb47c35521a6ee91a29 (patch) | |
| tree | 66ff813418e083ed711a187810e1622d6dcf8ddf /roles/docker/tasks/systemcontainer_docker.yml | |
| parent | cc161d1b79f53b7daa4837f9fc262455cf04a4f4 (diff) | |
| download | openshift-9d6e86c0217c97d33aecdcb47c35521a6ee91a29.tar.gz openshift-9d6e86c0217c97d33aecdcb47c35521a6ee91a29.tar.bz2 openshift-9d6e86c0217c97d33aecdcb47c35521a6ee91a29.tar.xz openshift-9d6e86c0217c97d33aecdcb47c35521a6ee91a29.zip | |
Migrate enterprise registry logic to docker role
Currently, the enterprise registry to forcefully added
in openshift_facts. Recently, the docker role has
been modified to consume registry variables directly,
bypassing openshift_facts.
This commit cleans up unused code in openshift_facts,
and migrates enterprise registry logic to the
docker role.
Fixes: https://github.com/openshift/openshift-ansible/issues/5557
Diffstat (limited to 'roles/docker/tasks/systemcontainer_docker.yml')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 146e5f430..8b43393cb 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -148,10 +148,10 @@ # Set local versions of facts that must be in json format for container-daemon.json # NOTE: When jinja2.9+ is used the container-daemon.json file can move to using tojson - set_fact: - l_docker_insecure_registries: "{{ docker_insecure_registries | default([]) | to_json }}" + l_docker_insecure_registries: "{{ l2_docker_insecure_registries | default([]) | to_json }}" l_docker_log_options: "{{ docker_log_options | default({}) | to_json }}" - l_docker_additional_registries: "{{ docker_additional_registries | default([]) | to_json }}" - l_docker_blocked_registries: "{{ docker_blocked_registries | default([]) | to_json }}" + l_docker_additional_registries: "{{ l2_docker_additional_registries | default([]) | to_json }}" + l_docker_blocked_registries: "{{ l2_docker_blocked_registries | default([]) | to_json }}" l_docker_selinux_enabled: "{{ docker_selinux_enabled | default(true) | to_json }}" # Configure container-engine using the container-daemon.json file |