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 /roles/openshift_hosted/defaults | |
| 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 'roles/openshift_hosted/defaults')
| -rw-r--r-- | roles/openshift_hosted/defaults/main.yml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/roles/openshift_hosted/defaults/main.yml b/roles/openshift_hosted/defaults/main.yml index 0391e5602..13cbfb14e 100644 --- a/roles/openshift_hosted/defaults/main.yml +++ b/roles/openshift_hosted/defaults/main.yml @@ -1,4 +1,10 @@ --- +r_openshift_hosted_router_firewall_enabled: True +r_openshift_hosted_router_use_firewalld: False + +r_openshift_hosted_registry_firewall_enabled: True +r_openshift_hosted_registry_use_firewalld: False + registry_volume_claim: 'registry-claim' openshift_hosted_router_edits: @@ -26,12 +32,15 @@ openshift_hosted_routers: - 443:443 certificate: "{{ openshift_hosted_router_certificate | default({}) }}" - openshift_hosted_router_certificate: {} openshift_hosted_registry_cert_expire_days: 730 openshift_hosted_router_create_certificate: True -os_firewall_allow: +r_openshift_hosted_router_os_firewall_deny: [] +r_openshift_hosted_router_os_firewall_allow: [] + +r_openshift_hosted_registry_os_firewall_deny: [] +r_openshift_hosted_registry_os_firewall_allow: - service: Docker Registry Port port: 5000/tcp - when: openshift.common.use_calico | bool + cond: "{{ r_openshift_hosted_use_calico }}" |