Merge pull request #68 from toanju/networkd-reload

networkd reload

pillar.example

@@ -121,12 +121,17 @@ systemd:
 
   ## networkd
   networkd:
+    fileattr:
+      br0.network:
+        user: systemd-network
+        group: systemd-network
+        mode: "0600"
     profiles:
       network:
-        # eth0.network
-        eth0:
+        # br0.network
+        br0:
           - Match:
-              - Name: eth0
+              - Name: br0
           - Network:
               - DHCP: "yes"
 

systemd/defaults.yaml

@@ -19,7 +19,10 @@ systemd:
       PollIntervalMaxSec: 2048
 
   networkd:
+    # networkctl reload is available since systemd 244
+    networkctl_reload: false
     pkg: {}
+    fileattr: {}
     path: /etc/systemd/network
     service: systemd-networkd
     wait_online: true

systemd/networkd/profiles.sls

@@ -5,26 +5,42 @@
 {%- set networkd = systemd.get('networkd', {}) %}
 {%- set profiles = networkd.get('profiles', {}) %}
 
+{%- if networkd.networkctl_reload %}
 include:
-  - systemd.reload
+  - systemd.networkd.reload
+{%- endif %}
 
-{% if profiles is mapping %}
-{% for networkdprofile, types in profiles.items()  %}
-  {% for profile, profileconfig in types.items() %}
+{%- if profiles is mapping %}
 
-/etc/systemd/network/{{ profile }}.{{ networkdprofile }}:
-  file.managed:
-    - template: jinja
-    - source: salt://systemd/networkd/templates/profile.jinja
+/etc/systemd/network:
+  file.directory:
     - user: root
     - group: root
-    - mode: '0644'
     - makedirs: true
     - dir_mode: 755
+
+{%- for networkdprofile, types in profiles.items()  %}
+  {%- for profile, profileconfig in types.items() %}
+  {%- set filename = profile ~ "." ~ networkdprofile %}
+  {%- set user = networkd.fileattr.get(filename, {}).user | default("root") %}
+  {%- set group = networkd.fileattr.get(filename, {}).group | default("root") %}
+  {%- set mode = networkd.fileattr.get(filename, {}).mode | default("0644") %}
+
+/etc/systemd/network/{{ filename }}:
+  file.managed:
+    - template: jinja
+    - source: salt://systemd/networkd/templates/profile.jinja
+    - user: {{ user }}
+    - group: {{ group }}
+    - mode: {{ mode }}
     - context:
         config: {{ profileconfig|json }}
+    - require:
+      - file: /etc/systemd/network
+{%- if networkd.networkctl_reload %}
     - watch_in:
-      - cmd: reload_systemd_configuration
-  {% endfor %}
-{% endfor %}
-{% endif %}
+      - cmd: systemd-networkd-reload-cmd-wait
+{%- endif %}
+  {%- endfor %}
+{%- endfor %}
+{%- endif %}

systemd/networkd/reload.sls

@@ -0,0 +1,9 @@
+include:
+  - systemd.networkd
+
+systemd-networkd-reload-cmd-wait:
+  cmd.wait:
+    - name: networkctl reload
+    - runas: root
+    - require:
+      - service: networkd

systemd/networkd/templates/profile.jinja

@@ -16,7 +16,7 @@
                 {%- endfor -%}
             {%- endif -%}
         {%- endfor %}
-    {% endfor %}
+    {%- endfor %}
 {%- endmacro -%}
 
 # This file is managed by Salt via {{ source }}

systemd/osmap.yaml

@@ -14,6 +14,7 @@ Fedora:
   pkgs_extra:
     - python3-systemd
   networkd:
+    networkctl_reload: true
     pkg: {}
   resolved:
     pkg: {}

test/integration/default/controls/networkd_spec.rb

@@ -14,11 +14,11 @@
     it { should_not exist }
   end
 
-  describe file('/etc/systemd/network/eth0.network') do
+  describe file('/etc/systemd/network/br0.network') do
     its('type') { should eq :file }
-    its('mode') { should cmp '0644' }
-    its('owner') { should eq 'root' }
-    its('group') { should eq 'root' }
+    its('mode') { should cmp '0600' }
+    its('owner') { should eq 'systemd-network' }
+    its('group') { should eq 'systemd-network' }
   end
 
   describe file('/etc/systemd/network/br0.netdev') do