diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-11 16:10:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 16:10:27 -0500 |
| commit | 97cf14a03d2b392e2355478c74882d7be9f653d2 (patch) | |
| tree | 409be032ef994b90a9df6c9b1a93103c71c022c1 /playbooks/common/openshift-cluster/config.yml | |
| parent | 5aae26f2aa7d5521421343f33973325be2db9d06 (diff) | |
| parent | 7437a62c66b18d328758dbc1f3ff175aa2f53cd1 (diff) | |
| download | openshift-97cf14a03d2b392e2355478c74882d7be9f653d2.tar.gz openshift-97cf14a03d2b392e2355478c74882d7be9f653d2.tar.bz2 openshift-97cf14a03d2b392e2355478c74882d7be9f653d2.tar.xz openshift-97cf14a03d2b392e2355478c74882d7be9f653d2.zip | |
Merge pull request #3892 from mtnbikenc/refactor-oo-option-facts
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster/config.yml')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 1b967b7f1..3c70db6a9 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -1,30 +1,7 @@ --- -- name: Set oo_option facts - hosts: oo_all_hosts +- include: initialize_oo_option_facts.yml tags: - 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: - openshift_docker_log_driver: "{{ lookup('oo_option', 'docker_log_driver') }}" - when: openshift_docker_log_driver is not defined - - set_fact: - openshift_docker_log_options: "{{ lookup('oo_option', 'docker_log_options') }}" - when: openshift_docker_log_options is not defined - - set_fact: - openshift_docker_selinux_enabled: "{{ lookup('oo_option', 'docker_selinux_enabled') }}" - when: openshift_docker_selinux_enabled is not defined - include: disable_excluder.yml tags: |