diff options
author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-08-26 14:12:08 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-26 14:12:08 -0400 |
commit | cc45402b22703aedb9986fa9a95f530a11633edb (patch) | |
tree | 7a204b4c0d42cc90ad78dcaafa8ef745a1cb7239 /roles/openshift_storage_glusterfs/defaults | |
parent | 959e6c311ead326f57fe967b646f44beb4b53bbb (diff) | |
parent | d9d39f333fe7a68440faa1d433809f6f86bd116d (diff) | |
download | openshift-cc45402b22703aedb9986fa9a95f530a11633edb.tar.gz openshift-cc45402b22703aedb9986fa9a95f530a11633edb.tar.bz2 openshift-cc45402b22703aedb9986fa9a95f530a11633edb.tar.xz openshift-cc45402b22703aedb9986fa9a95f530a11633edb.zip |
Merge pull request #5227 from kwoodson/firewall_defaults_fix
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_storage_glusterfs/defaults')
-rw-r--r-- | roles/openshift_storage_glusterfs/defaults/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_storage_glusterfs/defaults/main.yml b/roles/openshift_storage_glusterfs/defaults/main.yml index a5887465e..8d21a3f27 100644 --- a/roles/openshift_storage_glusterfs/defaults/main.yml +++ b/roles/openshift_storage_glusterfs/defaults/main.yml @@ -52,8 +52,8 @@ openshift_storage_glusterfs_registry_heketi_ssh_port: "{{ openshift_storage_glus openshift_storage_glusterfs_registry_heketi_ssh_user: "{{ openshift_storage_glusterfs_heketi_ssh_user }}" openshift_storage_glusterfs_registry_heketi_ssh_sudo: "{{ openshift_storage_glusterfs_heketi_ssh_sudo }}" openshift_storage_glusterfs_registry_heketi_ssh_keyfile: "{{ openshift_storage_glusterfs_heketi_ssh_keyfile | default(omit) }}" -r_openshift_master_firewall_enabled: True -r_openshift_master_use_firewalld: False +r_openshift_master_firewall_enabled: "{{ os_firewall_enabled | default(True) }}" +r_openshift_master_use_firewalld: "{{ os_firewall_use_firewalld | default(False) }}" r_openshift_storage_glusterfs_os_firewall_deny: [] r_openshift_storage_glusterfs_os_firewall_allow: - service: glusterfs_sshd |