infra: add firewall configuration for containerized deployment

firewalld is available on atomic so there is no reason to not apply
firewall configuration.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

roles/ceph-infra/tasks/configure_firewallyml

@@ -9,6 +9,8 @@
   changed_when: false
   tags:
     - firewall
+  when:
+    - not containerized_deployment
 
 - name: start firewalld
   service:
@@ -16,7 +18,9 @@
     state: started
     enabled: yes
   when:
+    - not firewalld_pkg_query.skipped
     - firewalld_pkg_query.rc == 0
+      or is_atomic
 
 - name: open monitor ports
   firewalld:

roles/ceph-infra/tasks/main.yml

@@ -1,6 +1,6 @@
 ---
-- name: include_tasks configure_firewall_rpm.yml
-  include_tasks: configure_firewall_rpm.yml
+- name: include_tasks configure_firewall.yml
+  include_tasks: configure_firewall.yml
   when:
     - configure_firewall
     - ansible_os_family in ['RedHat', 'Suse']
@@ -15,4 +15,4 @@
   include_tasks: "ntp_rpm.yml"
   when:
     - ansible_os_family in ['RedHat', 'Suse']
-    - ntp_service_enabled
+    - ntp_service_enabled

site-docker.yml.sample

@@ -54,6 +54,7 @@
     - role: ceph-defaults
       tags: [with_pkg, fetch_container_image]
     - role: ceph-validate
+    - role: ceph-infra
     - role: ceph-handler
     - role: ceph-docker-common
       tags: [with_pkg, fetch_container_image]