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/package_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/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 |