summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks/package_docker.yml
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-10-19 12:26:41 -0400
committerSteve Milner <smilner@redhat.com>2017-10-19 12:29:29 -0400
commit2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922 (patch)
tree88b54ce53cd1b826a7fd3d0a79b783b97a17b07f /roles/docker/tasks/package_docker.yml
parent61cca52ea383d75aa4c20cf0e96936a5188084e9 (diff)
downloadopenshift-2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922.tar.gz
openshift-2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922.tar.bz2
openshift-2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922.tar.xz
openshift-2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922.zip
docker: Move enterprise registry from pkg to main
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503860 Signed-off-by: Steve Milner <smilner@redhat.com>
Diffstat (limited to 'roles/docker/tasks/package_docker.yml')
-rw-r--r--roles/docker/tasks/package_docker.yml8
1 files changed, 0 insertions, 8 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml
index 7ccab37a5..d6aee0513 100644
--- a/roles/docker/tasks/package_docker.yml
+++ b/roles/docker/tasks/package_docker.yml
@@ -52,14 +52,6 @@
- restart docker
when: not (os_firewall_use_firewalld | default(False)) | bool
-- name: Add enterprise registry, if necessary
- set_fact:
- l2_docker_additional_registries: "{{ l2_docker_additional_registries + [openshift_docker_ent_reg] }}"
- when:
- - openshift.common.deployment_type == 'openshift-enterprise'
- - openshift_docker_ent_reg != ''
- - openshift_docker_ent_reg not in l2_docker_additional_registries
-
- stat: path=/etc/sysconfig/docker
register: docker_check