diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-09-28 11:17:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 11:17:25 -0700 |
| commit | 099b032be0d5cc773a2e4fb16e428befdf16e536 (patch) | |
| tree | af9bc31bf7d3dcd911cf2a5f306eee4c9ea216de /roles/openshift_docker_facts | |
| parent | e3d5519c6d68b9aa162a58e1a897b6e4f6b0eea1 (diff) | |
| parent | 9d6e86c0217c97d33aecdcb47c35521a6ee91a29 (diff) | |
| download | openshift-099b032be0d5cc773a2e4fb16e428befdf16e536.tar.gz openshift-099b032be0d5cc773a2e4fb16e428befdf16e536.tar.bz2 openshift-099b032be0d5cc773a2e4fb16e428befdf16e536.tar.xz openshift-099b032be0d5cc773a2e4fb16e428befdf16e536.zip | |
Merge pull request #5559 from mgugino-upstream-stage/readd-ent-registry
Automatic merge from submit-queue.
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/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 334150f63..5a3e50678 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -6,9 +6,6 @@ with_items: - role: docker local_facts: - additional_registries: "{{ openshift_docker_additional_registries | default(None) }}" - blocked_registries: "{{ openshift_docker_blocked_registries | default(None) }}" - insecure_registries: "{{ openshift_docker_insecure_registries | default(None) }}" selinux_enabled: "{{ openshift_docker_selinux_enabled | default(None) }}" log_driver: "{{ openshift_docker_log_driver | default(None) }}" log_options: "{{ openshift_docker_log_options | default(None) }}" @@ -23,12 +20,6 @@ sdn_mtu: "{{ openshift_node_sdn_mtu | default(None) }}" - set_fact: - docker_additional_registries: "{{ openshift.docker.additional_registries - | default(omit) }}" - docker_blocked_registries: "{{ openshift.docker.blocked_registries - | default(omit) }}" - docker_insecure_registries: "{{ openshift.docker.insecure_registries - | default(omit) }}" docker_selinux_enabled: "{{ openshift.docker.selinux_enabled | default(omit) }}" docker_log_driver: "{{ openshift.docker.log_driver | default(omit) }}" docker_log_options: "{{ openshift.docker.log_options | default(omit) }}" |