diff --git a/salt/fwdriver/init.sls b/salt/fwdriver/init.sls index 10d0732..770c41c 100644 --- a/salt/fwdriver/init.sls +++ b/salt/fwdriver/init.sls @@ -15,6 +15,10 @@ disable_os_firewall: {% endif %} firewall: + service.running: + - require: + - network: vm + - pkg: firewall pkg.installed: - pkgs: {% if grains['os_family'] == 'RedHat' %} diff --git a/salt/fwdriver/network.sls b/salt/fwdriver/network.sls index 927595d..5e4b6dd 100644 --- a/salt/fwdriver/network.sls +++ b/salt/fwdriver/network.sls @@ -21,6 +21,9 @@ vm: - require: - cmd: ovs-if + +{# -- DHCP server configuration -- #} + {% if grains['os'] == 'Debian' %} symlink_dhcpd: file.symlink: @@ -33,13 +36,6 @@ symlink_dhcpd: - file: symlink_dhcpd {% endif %} -firewall2: - service: - - name: firewall - - running - - require: - - network: vm - {% if grains['os_family'] == 'RedHat' %} fix_dhcp: cmd.script: