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 /playbooks/common/openshift-cluster | |
| 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 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_oo_option_facts.yml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml b/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml index ac3c702a0..dab17aaa9 100644 --- a/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml +++ b/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml @@ -5,15 +5,6 @@ - always tasks: - set_fact: - openshift_docker_additional_registries: "{{ lookup('oo_option', 'docker_additional_registries') }}" - when: openshift_docker_additional_registries is not defined - - set_fact: - openshift_docker_insecure_registries: "{{ lookup('oo_option', 'docker_insecure_registries') }}" - when: openshift_docker_insecure_registries is not defined - - set_fact: - openshift_docker_blocked_registries: "{{ lookup('oo_option', 'docker_blocked_registries') }}" - when: openshift_docker_blocked_registries is not defined - - set_fact: openshift_docker_options: "{{ lookup('oo_option', 'docker_options') }}" when: openshift_docker_options is not defined - set_fact: |