diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-08-11 12:03:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 12:03:58 -0400 |
| commit | 3409e6db205b6b24914e16c62972de50071f4051 (patch) | |
| tree | dbfacaf9d6640241ee5dd7a2446d330a4e12283e /playbooks | |
| parent | 57d7984bc7d7f64184c0defd3cc305cb3ef2708f (diff) | |
| parent | 7d50ffe98dfa17e3fb72627699c794843ed5295d (diff) | |
| download | openshift-3409e6db205b6b24914e16c62972de50071f4051.tar.gz openshift-3409e6db205b6b24914e16c62972de50071f4051.tar.bz2 openshift-3409e6db205b6b24914e16c62972de50071f4051.tar.xz openshift-3409e6db205b6b24914e16c62972de50071f4051.zip | |
Merge pull request #4797 from kwoodson/os_firewall_refactor
Refactor the firewall workflow.
Diffstat (limited to 'playbooks')
| -rw-r--r-- | playbooks/common/openshift-cluster/initialize_firewall.yml | 7 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/openshift_hosted.yml | 1 | ||||
| -rw-r--r-- | playbooks/common/openshift-cluster/std_include.yml | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/initialize_firewall.yml b/playbooks/common/openshift-cluster/initialize_firewall.yml new file mode 100644 index 000000000..7d7a427d4 --- /dev/null +++ b/playbooks/common/openshift-cluster/initialize_firewall.yml @@ -0,0 +1,7 @@ +--- +- name: Initialize host facts + hosts: oo_all_hosts + tasks: + - name: install and configure the proper firewall settings + include_role: + name: os_firewall 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 diff --git a/playbooks/common/openshift-cluster/std_include.yml b/playbooks/common/openshift-cluster/std_include.yml index 6ed31a644..eab16aba0 100644 --- a/playbooks/common/openshift-cluster/std_include.yml +++ b/playbooks/common/openshift-cluster/std_include.yml @@ -14,3 +14,7 @@ - include: initialize_openshift_version.yml tags: - always + +- include: initialize_firewall.yml + tags: + - always |