summaryrefslogtreecommitdiffstats
path: root/roles/docker/templates
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-28 11:17:25 -0700
committerGitHub <noreply@github.com>2017-09-28 11:17:25 -0700
commit099b032be0d5cc773a2e4fb16e428befdf16e536 (patch)
treeaf9bc31bf7d3dcd911cf2a5f306eee4c9ea216de /roles/docker/templates
parente3d5519c6d68b9aa162a58e1a897b6e4f6b0eea1 (diff)
parent9d6e86c0217c97d33aecdcb47c35521a6ee91a29 (diff)
downloadopenshift-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/templates')
0 files changed, 0 insertions, 0 deletions