diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2017-07-19 08:51:14 -0400 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2017-08-08 10:46:12 -0400 |
| commit | 4f9b26e8af5890b7960291497020586426e7f1fc (patch) | |
| tree | ba2dd554f739485a9c2e8654e6af626b54e7a520 /playbooks | |
| parent | 0569c5069dabeea9e2fe94cd097cb6f2b1540867 (diff) | |
| download | openshift-4f9b26e8af5890b7960291497020586426e7f1fc.tar.gz openshift-4f9b26e8af5890b7960291497020586426e7f1fc.tar.bz2 openshift-4f9b26e8af5890b7960291497020586426e7f1fc.tar.xz openshift-4f9b26e8af5890b7960291497020586426e7f1fc.zip | |
First attempt at refactor of os_firewall
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/config.yml | 15 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 1 |
2 files changed, 16 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml index 7136f1c1f..423573540 100644 --- a/playbooks/common/openshift-cluster/config.yml +++ b/playbooks/common/openshift-cluster/config.yml @@ -26,6 +26,21 @@ tags: - always +- name: Setup firewall + hosts: oo_all_hosts + tags: + - always + tasks: + # This should move to intialize_facts + - name: set os_firewall_enabled + set_fact: + os_firewall_enabled: true + os_firewall_use_firewalld: false + + - name: Set proper firewall settings + include_role: + name: os_firewall + - name: Disable excluders hosts: oo_masters_to_config:oo_nodes_to_config tags: diff --git a/playbooks/common/openshift-cluster/openshift_hosted.yml b/playbooks/common/openshift-cluster/openshift_hosted.yml index ce7f981ab..99a634970 100644 --- a/playbooks/common/openshift-cluster/openshift_hosted.yml +++ b/playbooks/common/openshift-cluster/openshift_hosted.yml @@ -29,6 +29,7 @@ - role: openshift_default_storage_class when: openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce') - role: openshift_hosted + r_openshift_hosted_use_calico: "{{ openshift.common.use_calico | default(false) | bool }}" - role: openshift_metrics when: openshift_hosted_metrics_deploy | default(false) | bool - role: openshift_logging |