fwdriver: move service state to init.sls from network.sls

salt/fwdriver/init.sls

@@ -15,6 +15,10 @@ disable_os_firewall:
     {% endif %}
     {% endif %}
 
 
 firewall:
 firewall:
+  service.running:
+    - require:
+      - network: vm
+      - pkg: firewall
   pkg.installed:
   pkg.installed:
     - pkgs:
     - pkgs:
       {% if grains['os_family'] == 'RedHat' %}
       {% if grains['os_family'] == 'RedHat' %}

salt/fwdriver/network.sls

@@ -21,6 +21,9 @@ vm:
     - require:
     - require:
       - cmd: ovs-if
       - cmd: ovs-if
 
 
+
+{# -- DHCP server configuration -- #}
+
 {% if grains['os'] == 'Debian' %}
 {% if grains['os'] == 'Debian' %}
 symlink_dhcpd:
 symlink_dhcpd:
   file.symlink:
   file.symlink:
@@ -33,13 +36,6 @@ symlink_dhcpd:
       - file: symlink_dhcpd
       - file: symlink_dhcpd
 {% endif %}
 {% endif %}
 
 
-firewall2:
-  service:
-    - name: firewall
-    - running
-    - require:
-      - network: vm
-
 {% if grains['os_family'] == 'RedHat' %}
 {% if grains['os_family'] == 'RedHat' %}
 fix_dhcp:
 fix_dhcp:
   cmd.script:
   cmd.script: