ospf: mkdir /var/run/quagga fixes

This commit is contained in:
Astro 2016-11-28 23:49:37 +01:00
parent 9b9b2fe575
commit 04f28303ec
4 changed files with 9 additions and 9 deletions

View File

@ -10,14 +10,15 @@ quagga:
file.managed:
- source: salt://ospf/{{ daemon }}.conf
- template: 'jinja'
- require:
- pkg: quagga
autostart-{{ daemon }}:
service.enabled:
- name: {{ daemon }}
require_in:
require:
- file: /etc/systemd/system/{{ daemon }}.service
- file: /etc/quagga/{{ daemon }}.conf
- file: /var/run/quagga
start-{{ daemon }}:
service.running:
@ -28,10 +29,3 @@ start-{{ daemon }}:
- file: /etc/quagga/{{ daemon }}.conf
{%- endfor %}
/var/run/quagga:
file.directory:
- user: quagga
group: quagga

View File

@ -1,3 +1,5 @@
log file /var/log/quagga/ospfd.log
{%- set id = salt['grains.get']('id') %}
{%- set core_ifaces = ['br-core', 'core'] %}

View File

@ -0,0 +1,2 @@
hostname {{ salt['grains.get']('id') }}
log file /var/log/quagga/zebra.log

View File

@ -2,6 +2,8 @@
After = network.target
[Service]
ExecStartPre=-/usr/bin/mkdir /var/run/quagga
ExecStartPre=/usr/bin/chown -R quagga:quagga /var/run/quagga/
ExecStart = /usr/lib/quagga/zebra
[Install]