fwdriver, network, storagedriver: fix fwdriver, fix cent os dhcp server problems…

fwdriver, network, storagedriver: fix fwdriver, fix cent os dhcp server problems with fix_dhcp.sh, storagedriver cent os 7 port

salt/fwdriver/init.sls

@@ -36,4 +36,12 @@ firewall:
     - present
     - present
     - name: {{ pillar['fwdriver']['user'] }}
     - name: {{ pillar['fwdriver']['user'] }}
     - gid_from_name: True
     - gid_from_name: True
+  service:
+    - enabled
+    - require:
+      - service: firewall-init
+
+firewall-init:
+  service:
+    - enabled
 
 

salt/network/files/fix_dhcp.sh

+#!/bin/bash
+sed -i '/HWADDR=.*/d' /etc/sysconfig/network-scripts/ifcfg-vm
+ifup vm
+systemctl restart dhcpd
+
+exit 0
+

salt/network/init.sls

@@ -8,8 +8,8 @@ vm:
     - enabled: True
     - enabled: True
     - type: eth
     - type: eth
     - proto: none
     - proto: none
-    - ipaddr: {{ pillar['fwdriver']['vm_net'].split('/')[0] }}
-    - netmask: {{ pillar['fwdriver']['vm_net'].split('/')[1] }}
+    - ipaddr: {{ pillar['fwdriver']['vm_net_ip'] }}
+    - netmask: {{ pillar['fwdriver']['vm_net_mask'] }}
     - pre_up_cmds:
     - pre_up_cmds:
     {% if grains['os_family'] == 'RedHat' %}
     {% if grains['os_family'] == 'RedHat' %}
       - /bin/systemctl restart openvswitch
       - /bin/systemctl restart openvswitch
@@ -32,3 +32,6 @@ salt://network/files/reload_firewall.sh:
     - user: {{ pillar['user'] }}
     - user: {{ pillar['user'] }}
     - require:
     - require:
       - service: firewall2
       - service: firewall2
+
+salt://network/files/fix_dhcp.sh:
+  cmd.script

salt/storagedriver/nfs-server.sls

@@ -2,11 +2,13 @@
 nfs-server:
 nfs-server:
   service:
   service:
   {% if grains['os_family'] != 'RedHat' %}
   {% if grains['os_family'] != 'RedHat' %}
-   - name: nfs-kernel-server
+    - name: nfs-kernel-server
   {% endif %}
   {% endif %}
-   - running
-   - watch:
-     - file: /etc/exports
+    - running
+    - watch:
+      - file: /etc/exports
+    - require:
+      - service: rpcbind
   pkg.installed:
   pkg.installed:
   {% if grains['os_family'] == 'RedHat' %}
   {% if grains['os_family'] == 'RedHat' %}
     - name: nfs-utils
     - name: nfs-utils
@@ -14,6 +16,10 @@ nfs-server:
     - name: nfs-kernel-server
     - name: nfs-kernel-server
   {% endif %}
   {% endif %}
   
   
+rpcbind:
+  service:
+    - running
+
 /etc/exports:
 /etc/exports:
   file.managed:
   file.managed:
     - template: jinja
     - template: jinja