move ospf_secret into salt-pillar

2016-11-16 02:29:16 +01:00 · 2016-11-16 02:29:16 +01:00 · 66644cd50b
parent fb65984b0b
commit 66644cd50b
4 changed files with 17 additions and 17 deletions
--- a/salt-pillar/ospf/init.sls
+++ b/salt-pillar/ospf/init.sls
@ -0,0 +1,15 @@
+#!yaml|gpg
+ospf:
+  ospf_secret: |
+    -----BEGIN PGP MESSAGE-----
+    
+    hQEMA2PKcvDMvlKLAQf/UzB2wsDsIfUEIEx20IehQbTkw5A9gCYnuW09lvkzxlgY
+    IHDh8arul9ED7GFdVBja5cZVCs/dzqG0j+uP8zAwMjBLvvS6AopFnVdZnM0ANLth
+    WCam9LxN+pxweD5DugODYzHZq2I3ktDqUAXwG0ORT4RyrM3kqP1hmWq9pP37breA
+    QabQG4BF6hCx09P2MN/Wvy//9RNwNWlMsM2UAvsau+t35y3UEr/UbMNYYYPXKt2l
+    fcQntwl2VEDin9XbrskBxQzACvn0rthUZwJ8n1oB8m3f7uGw6kIEf3eZ0eSQHafm
+    8MwVeLqsw0ZDIww2Oi4+RWLrFPa8bwJO1U2C6k/8qNJLAelPUBWkCetDoRlf1xEh
+    Umyi2PS5RIeUU49CoAMbrIsjUsQTBjYwTdiGCvH0RL5NIgWWaxoO3913AliIDUBh
+    bQaDO9GE1xb//lO+
+    =4yPK
+    -----END PGP MESSAGE-----
--- a/salt-pillar/top.sls
+++ b/salt-pillar/top.sls
@ -3,6 +3,7 @@ base:
    - hosts
    - subnets
    - vlans
+    - ospf
  '*gw':
    - dhcp
  'anon1':
--- a/salt/ospf/init.sls
+++ b/salt/ospf/init.sls
@ -1,5 +1,3 @@
-#!yaml|gpg
-
 quagga:
  pkg.installed: []

@ -12,20 +10,6 @@ quagga:
  file.managed:
    - source: salt://ospf/{{ daemon }}.conf
    - template: 'jinja'
-    - context:
-        ospf_secret: |
-          -----BEGIN PGP MESSAGE-----
-          
-          hQEMA2PKcvDMvlKLAQf/UzB2wsDsIfUEIEx20IehQbTkw5A9gCYnuW09lvkzxlgY
-          IHDh8arul9ED7GFdVBja5cZVCs/dzqG0j+uP8zAwMjBLvvS6AopFnVdZnM0ANLth
-          WCam9LxN+pxweD5DugODYzHZq2I3ktDqUAXwG0ORT4RyrM3kqP1hmWq9pP37breA
-          QabQG4BF6hCx09P2MN/Wvy//9RNwNWlMsM2UAvsau+t35y3UEr/UbMNYYYPXKt2l
-          fcQntwl2VEDin9XbrskBxQzACvn0rthUZwJ8n1oB8m3f7uGw6kIEf3eZ0eSQHafm
-          8MwVeLqsw0ZDIww2Oi4+RWLrFPa8bwJO1U2C6k/8qNJLAelPUBWkCetDoRlf1xEh
-          Umyi2PS5RIeUU49CoAMbrIsjUsQTBjYwTdiGCvH0RL5NIgWWaxoO3913AliIDUBh
-          bQaDO9GE1xb//lO+
-          =4yPK
-          -----END PGP MESSAGE-----

 autostart-{{ daemon }}:
  service.enabled:
--- a/salt/ospf/ospfd.conf
+++ b/salt/ospf/ospfd.conf
@ -6,7 +6,7 @@ interface {{ iface }}
    ip ospf network broadcast
    ip ospf authentication message-digest
    ! TODO:
-    ip ospf message-digest-key 1 md5 {{ ospf_secret }}
+    ip ospf message-digest-key 1 md5 {{ pillar['ospf']['ospf_secret'] }}

 {%- endfor %}