Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
salt-state
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FFFFM
salt-state
Commits
edfce2f7
Commit
edfce2f7
authored
3 years ago
by
MyIgel
Committed by
skorpy
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
network: fix dependencies on batman gateways
parent
c59412e6
No related branches found
Branches containing commit
No related tags found
1 merge request
!584
network: fix dependencies on batman gateways
Pipeline
#32808
passed
3 years ago
Stage: lint
Stage: highstate
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
network/domains-batman-systemd.sls
+2
-0
2 additions, 0 deletions
network/domains-batman-systemd.sls
network/files/ifup-domain-batman.sh.j2
+4
-3
4 additions, 3 deletions
network/files/ifup-domain-batman.sh.j2
with
6 additions
and
3 deletions
network/domains-batman-systemd.sls
+
2
−
0
View file @
edfce2f7
...
...
@@ -95,6 +95,8 @@ dom@{{ domain_id }}:
- file: /etc/systemd/system/dom@.service
- file: /opt/multidomain/dom_{{ domain_id }}_down.sh
- file: /opt/multidomain/dom_{{ domain_id }}_up.sh
{% if 'gateway' in salt['pillar.get']('roles', []) %}
- service: kea-dhcp4-server
- service: kea-dhcp6-server
{% endif %}
{% endfor %}
This diff is collapsed.
Click to expand it.
network/files/ifup-domain-batman.sh.j2
+
4
−
3
View file @
edfce2f7
...
...
@@ -100,10 +100,11 @@
{
%- endif %
}
# Restarting services
{
%
if
grains[
'id'
]
.startswith
(
'yanic'
)
%
}
systemctl reset-failed
&&
systemctl restart yanic
{
%-
else
%
}
{
%
if
'gateway'
in
salt[
'pillar.get'
](
'roles'
,
[])
%
}
birdc6 restart radv_dom
{{
domain_id
}}
systemctl reset-failed
&&
systemctl restart isc-kea-dhcp4-server
systemctl reset-failed
&&
systemctl restart isc-kea-dhcp6-server
{
%- endif %
}
{
%-
if
'yanic'
in
salt[
'pillar.get'
](
'roles'
,
[])
%
}
systemctl reset-failed
&&
systemctl restart yanic
{
%- endif %
}
This diff is collapsed.
Click to expand it.
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