Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
CIRCLE
/
salt
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
17
Merge Requests
1
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4f3c19c3
authored
9 years ago
by
Dóbé Péter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix dhcpd fail on reboot
parent
2785a7a6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
0 deletions
+20
-0
salt/network/files/fix_dhcp_Debian.conf
+10
-0
salt/network/init.sls
+10
-0
No files found.
salt/network/files/fix_dhcp_Debian.conf
0 → 100644
View file @
4f3c19c3
# systemd service file extras added by CIRCLE Salt installer:
# openvswitch and virtual network interface must be up before
# dhcpd is started
[
Unit
]
After
=
openvswitch
-
switch
.
service
[
Service
]
ExecStartPre
=-/
sbin
/
ifup
vm
{
# TODO: change 'vm' to pillar['fwdriver']['vm_if'] ? #}
{
# TODO: similar patch for firewall.service ? #}
This diff is collapsed.
Click to expand it.
salt/network/init.sls
View file @
4f3c19c3
...
@@ -49,3 +49,13 @@ isc-dhcp-server:
...
@@ -49,3 +49,13 @@ isc-dhcp-server:
- enable: True
- enable: True
- reload: True
- reload: True
{% if grains['os'] == 'Debian' %}
{# For next reboot #}
/etc/systemd/system/isc-dhcp-server.service.d/after_openvswitch.conf:
file.managed:
- source: salt://network/files/fix_dhcp_Debian.conf
- user: root
- group: root
- template: jinja
- makedirs: True
{% endif %}
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment