diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-09-14 13:17:07 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2017-09-29 10:57:21 -0400 |
| commit | b09f52797efe0dd5f4888672935bbf3b501dea37 (patch) | |
| tree | b432b55e59d97cea7f018f52af123d77ba5a1aa7 /playbooks/common/openshift-cluster | |
| parent | 9920ea81d7f036432553921b708cf8c49ac6ea62 (diff) | |
| download | openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.tar.gz openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.tar.bz2 openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.tar.xz openshift-b09f52797efe0dd5f4888672935bbf3b501dea37.zip | |
Remove oo_option facts.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 4 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_oo_option_facts.yml | 18 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/init.yml | 2 |
3 files changed, 0 insertions, 24 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index bf6f4e7cd..96a43230d 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -18,10 +18,6 @@ - docker_image_availability - docker_storage -- include: initialize_oo_option_facts.yml - tags: - - always - - include: ../openshift-etcd/config.yml - include: ../openshift-nfs/config.yml diff --git a/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml b/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml deleted file mode 100644 index dab17aaa9..000000000 --- a/playbooks/common/openshift-cluster/initialize_oo_option_facts.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Set oo_option facts - hosts: oo_all_hosts - tags: - - always - tasks: - - 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 diff --git a/playbooks/common/openshift-cluster/upgrades/init.yml b/playbooks/common/openshift-cluster/upgrades/init.yml index c98065cf4..2826951e6 100644 --- a/playbooks/common/openshift-cluster/upgrades/init.yml +++ b/playbooks/common/openshift-cluster/upgrades/init.yml @@ -5,8 +5,6 @@ g_new_master_hosts: [] g_new_node_hosts: [] -- include: ../initialize_oo_option_facts.yml - - include: ../initialize_facts.yml - name: Ensure firewall is not switched during upgrade |