Moving firewall rules under the role to work with refactor.

1 files changed, 12 insertions, 26 deletions

diff --git a/playbooks/common/openshift-glusterfs/config.yml b/playbooks/common/openshift-glusterfs/config.yml
index edc15a3f2..d9de578f3 100644
--- a/playbooks/common/openshift-glusterfs/config.yml
+++ b/playbooks/common/openshift-glusterfs/config.yml
@@ -1,40 +1,26 @@
 ---
 - name: Open firewall ports for GlusterFS nodes
   hosts: glusterfs
-  vars:
-    os_firewall_allow:
-    - service: glusterfs_sshd
-      port: "2222/tcp"
-    - service: glusterfs_daemon
-      port: "24007/tcp"
-    - service: glusterfs_management
-      port: "24008/tcp"
-    - service: glusterfs_bricks
-      port: "49152-49251/tcp"
-  roles:
-  - role: os_firewall
+  tasks:
+  - include_role:
+      name: openshift_storage_glusterfs
+      tasks_from: firewall.yml
     when:
     - openshift_storage_glusterfs_is_native | default(True) | bool
 
 - name: Open firewall ports for GlusterFS registry nodes
   hosts: glusterfs_registry
-  vars:
-    os_firewall_allow:
-    - service: glusterfs_sshd
-      port: "2222/tcp"
-    - service: glusterfs_daemon
-      port: "24007/tcp"
-    - service: glusterfs_management
-      port: "24008/tcp"
-    - service: glusterfs_bricks
-      port: "49152-49251/tcp"
-  roles:
-  - role: os_firewall
+  tasks:
+  - include_role:
+      name: openshift_storage_glusterfs
+      tasks_from: firewall.yml
     when:
     - openshift_storage_glusterfs_registry_is_native | default(True) | bool
 
 - name: Configure GlusterFS
   hosts: oo_first_master
-  roles:
-  - role: openshift_storage_glusterfs
+  tasks:
+  - name: setup glusterfs
+    include_role:
+      name: openshift_storage_glusterfs
     when: groups.oo_glusterfs_to_config | default([]) | count > 0