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/docker/tasks/package_docker.yml | |
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/docker/tasks/package_docker.yml')
-rw-r--r-- | roles/docker/tasks/package_docker.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index 0c5621259..4215dc5bd 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -50,6 +50,14 @@ src: custom.conf.j2 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 |