fixes, fixes

doc/test-environment.md

@@ -18,3 +18,17 @@ apt-get install salt-master salt-minion
 
 Set `master` to `localhost` in `/etc/salt/minion`, restart the
 minion. `salt-key -A` to accept the minion in the master.
+
+```shell
+salt \* state.apply
+```
+
+Then accept the container minions:
+```shell
+salt-key -A
+```
+
+And again:
+```shell
+salt \* state.apply
+```

salt/ospf/init.sls

@@ -17,6 +17,7 @@ autostart-{{ daemon }}:
       require_in:
         - file: /etc/systemd/system/{{ daemon }}.service
         - file: /etc/quagga/{{ daemon }}.conf
+        - file: /var/run/quagga
 
 start-{{ daemon }}:
   service.running:
@@ -25,4 +26,10 @@ start-{{ daemon }}:
         - service: autostart-{{ daemon }}
 
 {%- endfor %}
+
+/var/run/quagga:
+  file.directory:
+    - user: quagga
+      group: quagga
+
           

salt/ospf/ospfd.conf

@@ -3,9 +3,10 @@
 
 {%- for iface in core_ifaces %}
 interface {{ iface }}
-    ip ospf network multicast
+    ip ospf network broadcast
     ip ospf authentication message-digest
-    ip ospf authentication-key secret
+    ! TODO:
+    ip ospf message-digest-key 1 md5 secret
 
 {%- endfor %}
 

salt/server1-network.sls

@@ -29,7 +29,7 @@ bond0.{{ vlan }}:
         - network: bond0
 {% endfor %}
 
-{%- for net in ['core'] %}
+{%- for net in ['core', 'serv'] %}
 {%- set vlan = pillar['vlans'][net] %}
 br-{{ net }}:
   network.managed: