summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-03-28 16:50:04 -0400
committerRussell Teague <rteague@redhat.com>2017-04-10 09:50:40 -0400
commit7437a62c66b18d328758dbc1f3ff175aa2f53cd1 (patch)
treea515238f7abf91c5dffad2611d932b2e8dfaee07 /playbooks/common/openshift-cluster/upgrades
parent3ea629b458c78db194443563aab4a8d09e9a07b4 (diff)
downloadopenshift-7437a62c66b18d328758dbc1f3ff175aa2f53cd1.tar.gz
openshift-7437a62c66b18d328758dbc1f3ff175aa2f53cd1.tar.bz2
openshift-7437a62c66b18d328758dbc1f3ff175aa2f53cd1.tar.xz
openshift-7437a62c66b18d328758dbc1f3ff175aa2f53cd1.zip
Refactor use of initialize_oo_option_facts.yml
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/init.yml22
1 files changed, 1 insertions, 21 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml
index 01d151eb9..cc1fa5a0a 100644
--- a/playbooks/common/openshift-cluster/upgrades/init.yml
+++ b/playbooks/common/openshift-cluster/upgrades/init.yml
@@ -30,27 +30,7 @@
g_new_node_hosts: []
openshift_cluster_id: "{{ cluster_id | default('default') }}"
-- name: Set oo_options
- hosts: oo_all_hosts
- 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
+- include: ../initialize_oo_option_facts.yml
- include: ../initialize_facts.yml