Looks good! I suppose you have access everywhere by now so feel free to push it and apply changes on servers.
Would it make sense to tag firewalld tasks with "firewall" tag?