diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-23 05:57:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 05:57:11 -0700 |
| commit | cd53b726430977bdd5cab772765bae3aed149727 (patch) | |
| tree | ec892f1a529e56acfb6c389a4900231ae72d53be /roles/docker | |
| parent | d7cfb9e1a33d1637946aa10af5329290784ab41f (diff) | |
| parent | 2e5d7a6a848f20cccf3cf6d38aad4d9a9c80b922 (diff) | |
| download | openshift-cd53b726430977bdd5cab772765bae3aed149727.tar.gz openshift-cd53b726430977bdd5cab772765bae3aed149727.tar.bz2 openshift-cd53b726430977bdd5cab772765bae3aed149727.tar.xz openshift-cd53b726430977bdd5cab772765bae3aed149727.zip | |
Merge pull request #5818 from ashcrow/1503860
Automatic merge from submit-queue.
docker: Move enterprise registry from pkg to main
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/main.yml | 9 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index f73f90686..5ea73568a 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -10,6 +10,15 @@ l_use_crio: "{{ openshift_use_crio | default(False) }}" l_use_crio_only: "{{ openshift_use_crio_only | default(False) }}" +- 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 + - not l_use_crio_only + - name: Use Package Docker if Requested include: package_docker.yml when: 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 |