Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
systemd-formula
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
salt
systemd-formula
Commits
f4be1ed2
Commit
f4be1ed2
authored
4 years ago
by
Tobias Jungel
Browse files
Options
Downloads
Patches
Plain Diff
fix(networkd): use networkctl to reload config changes
parent
6fb14d58
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
systemd/defaults.yaml
+2
-0
2 additions, 0 deletions
systemd/defaults.yaml
systemd/networkd/profiles.sls
+9
-5
9 additions, 5 deletions
systemd/networkd/profiles.sls
systemd/networkd/reload.sls
+9
-0
9 additions, 0 deletions
systemd/networkd/reload.sls
systemd/osmap.yaml
+1
-0
1 addition, 0 deletions
systemd/osmap.yaml
with
21 additions
and
5 deletions
systemd/defaults.yaml
+
2
−
0
View file @
f4be1ed2
...
@@ -19,6 +19,8 @@ systemd:
...
@@ -19,6 +19,8 @@ systemd:
PollIntervalMaxSec
:
2048
PollIntervalMaxSec
:
2048
networkd
:
networkd
:
# networkctl reload is available since systemd 244
networkctl_reload
:
false
pkg
:
{}
pkg
:
{}
path
:
/etc/systemd/network
path
:
/etc/systemd/network
service
:
systemd-networkd
service
:
systemd-networkd
...
...
This diff is collapsed.
Click to expand it.
systemd/networkd/profiles.sls
+
9
−
5
View file @
f4be1ed2
...
@@ -5,8 +5,10 @@
...
@@ -5,8 +5,10 @@
{%- set networkd = systemd.get('networkd', {}) %}
{%- set networkd = systemd.get('networkd', {}) %}
{%- set profiles = networkd.get('profiles', {}) %}
{%- set profiles = networkd.get('profiles', {}) %}
{%- if networkd.networkctl_reload %}
include:
include:
- systemd.reload
- systemd.networkd.reload
{%- endif %}
{% if profiles is mapping %}
{% if profiles is mapping %}
{% for networkdprofile, types in profiles.items() %}
{% for networkdprofile, types in profiles.items() %}
...
@@ -23,8 +25,10 @@ include:
...
@@ -23,8 +25,10 @@ include:
- dir_mode: 755
- dir_mode: 755
- context:
- context:
config: {{ profileconfig|json }}
config: {{ profileconfig|json }}
{%- if networkd.networkctl_reload %}
- watch_in:
- watch_in:
- cmd: reload_systemd_configuration
- cmd: systemd-networkd-reload-cmd-wait
{% endfor %}
{%- endif %}
{% endfor %}
{%- endfor %}
{% endif %}
{%- endfor %}
{%- endif %}
This diff is collapsed.
Click to expand it.
systemd/networkd/reload.sls
0 → 100644
+
9
−
0
View file @
f4be1ed2
include:
- systemd.networkd
systemd-networkd-reload-cmd-wait:
cmd.wait:
- name: networkctl reload
- runas: root
- require:
- service: networkd
This diff is collapsed.
Click to expand it.
systemd/osmap.yaml
+
1
−
0
View file @
f4be1ed2
...
@@ -14,6 +14,7 @@ Fedora:
...
@@ -14,6 +14,7 @@ Fedora:
pkgs_extra
:
pkgs_extra
:
-
python3-systemd
-
python3-systemd
networkd
:
networkd
:
networkctl_reload
:
true
pkg
:
{}
pkg
:
{}
resolved
:
resolved
:
pkg
:
{}
pkg
:
{}
This diff is collapsed.
Click to expand it.
Dennis Ahrens
@ahrensde
mentioned in commit
b19b62ea
·
3 years ago
mentioned in commit
b19b62ea
mentioned in commit b19b62ea2cb8ddad70e0d4300dc3558a7d824b5a
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment