network: fix isc-dhcp-server service. firewall: extend pillar/firewall.sls

f2b8bdf0 · Czémán Arnold · c2c92c9c · f2b8bdf0 · f2b8bdf0
Commit f2b8bdf0 authored Jul 21, 2015 by Czémán Arnold
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

pillar/firewall.sls
+2 -0

salt/network/init.sls
+2 -1

No files found.
--- a/pillar/firewall.sls
+++ b/pillar/firewall.sls
@@ -8,6 +8,8 @@ fwdriver:

  vm_if: vm
  vm_net: 192.168.2.254/24
+  vm_net_ip: 192.168.2.254
+  vm_net_mask: 255.255.255.0

  management_if: eth5
  management_net: 192.168.1.254/24

--- a/salt/network/init.sls
+++ b/salt/network/init.sls
@@ -39,7 +39,8 @@ salt://network/files/fix_dhcp.sh:
 isc-dhcp-server:
  service:
    - running
-    - enabled
  {% if grains['os_family'] == 'RedHat' %}
    - name: dhcpd
  {% endif %}
+    - enable: True
+