summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-09-27 12:03:43 -0400
committerMichael Gugino <mgugino@redhat.com>2017-09-27 12:06:32 -0400
commit9d6e86c0217c97d33aecdcb47c35521a6ee91a29 (patch)
tree66ff813418e083ed711a187810e1622d6dcf8ddf /playbooks/common/openshift-cluster
parentcc161d1b79f53b7daa4837f9fc262455cf04a4f4 (diff)
downloadopenshift-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 'playbooks/common/openshift-cluster')
-rw-r--r--playbooks/common/openshift-cluster/initialize_oo_option_facts.yml9
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: