Move firewall setup to main.yml

I left it in the legacy setup, expecting to do the same in the newer
one. But I didn't. So this turned out problematic.

I moved it tot he main.yml file since it's an overall feature of the
role, and this way it's also explicit that it applies to both the newer
and the legacy setups.

tasks/legacy.yml

@@ -48,11 +48,6 @@
 - include: legacy-ipsec-conf.yml
   with_items: "{{ networks }}"
 
-- include: firewall.yml
-  when: not ipsec_skip_firewall_rules
-
-- meta: flush_handlers
-
 # Permissions gotten from http://www.linux-ha.org/doc/dev-guides/_installing_and_packaging_resource_agents.html
 - name: Install TripleO IPSEC resource agent
   copy:

tasks/main.yml

@@ -7,6 +7,11 @@
   block:
   - include: setup.yml
 
+  - include: firewall.yml
+    when: not ipsec_skip_firewall_rules|bool
+
+  - meta: flush_handlers
+
   # This doesn't use the dynamic inventory
   - include: legacy.yml
     when: enabled_networks is not defined or ipsec_force_install_legacy|bool