Browse Source

More examples for Annika :-)

 * Updated sites, add regions
 * Remove ffho pillar, added globals instead

Signed-off-by: Maximilian Wilhelm <max@sdn.clinic>
Maximilian Wilhelm 5 years ago
parent
commit
21417a027b

+ 0 - 10
zz_EXAMPLE_PILLAR/ffho.sls

@@ -1,10 +0,0 @@
-#
-# FFHO global pillar
-#
-
-ffho:
-  tech_c_mail: "<where should root mails go?>"
-
-# SNMP
-  snmp:
-    ro_community: "<your secret community here>"

+ 13 - 0
zz_EXAMPLE_PILLAR/globals.sls

@@ -0,0 +1,13 @@
+# Global configuration items
+
+globals:
+
+  # Mail address of the operators of this fine backbone?
+  ops_mail: "rootmail@ffho.net"
+
+  # SNMP setting
+  snmp:
+    # read-only community string for snmpd
+    ro_community: "not_public"
+
+

+ 140 - 0
zz_EXAMPLE_PILLAR/regions.sls

@@ -0,0 +1,140 @@
+regions:
+  ffho_abd:
+    - name: Altenbeken
+    - ssid_suffix: altenbkn
+    - site: pb_ost
+
+  ffho_bdr:
+    - name: Bad Driburg
+    - ssid_suffix: driburg
+    - site: hx_nord
+
+  ffho_rwb:
+    - name: Bad Lippspring
+    - ssid_suffix: badlippsp
+    - site: pb_nord
+
+  ffho_wux:
+    - name: Bad Wünnenberg
+    - ssid_suffix: wuennenb
+    - site: pb_sued
+
+  ffho_bev:
+    - name: Beverungen
+    - ssid_suffix: beverungn
+    - site: hx_sued
+
+  ffho_rhc:
+    - name: Borchen
+    - ssid_suffix: borchen
+    - site: pb_sued
+
+  ffho_bxg:
+    - name: Borgentreich
+    - ssid_suffix: borgentr
+    - site: hx_sued
+
+  ffho_bkk:
+    - name: Brakel
+    - ssid_suffix: brakel
+    - site: hx_nord
+
+  ffho_buq:
+    - name: Büren
+    - ssid_suffix: bueren
+    - site: buq
+
+  ffho_dek:
+    - name: Delbrück
+    - ssid_suffix: delbrueck
+    - site: pb_west
+
+  ffho_gee:
+    - name: Geseke
+    - ssid_suffix: geseke
+    - site: uml
+
+  ffho_zwg:
+    - name: Horn-Bad Meinberg
+    - ssid_suffix: horn
+    - site: uml
+
+  ffho_hvf:
+    - name: Hövelhof
+    - ssid_suffix: hoevelhof
+    - site: pb_west
+
+  ffho_hox:
+    - name: Höxter
+    - ssid_suffix: hoexter
+    - site: hx_nord
+
+  ffho_lit:
+     - name: Lichtenau
+     - ssid_suffix: lichtenau
+     - site: pb_ost
+
+  ffho_lip:
+    - name: Lippstadt
+    - ssid_suffix: lippstadt
+    - site: uml
+
+  ffho_mms:
+    - name: Marienmünster
+    - ssid_suffix: mms
+    - site: hx_nord
+
+  ffho_msg:
+    - name: Marsberg
+    - ssid_suffix: marsberg
+    - site: uml
+
+  ffho_yni:
+    - name: Nieheim
+    - ssid_suffix: nieheim
+    - site: hx_nord
+
+  ffho_pad_cty:
+    - name: Paderborn (Kernstadt)
+    - ssid_suffix: pad-cty
+    - site: pad-cty
+
+  ffho_pad_uml:
+    - name: Paderborn (Umland)
+    - ssid_suffix: pad-umlnd
+    - site: pad-uml
+
+  ffho_szn:
+    - name: Salzkotten
+    - ssid_suffix: salzkottn
+    - site: pb_west
+
+  ffho_yss:
+    - name: Schieder-Schwalenberg
+    - ssid_suffix: schieder
+    - site: uml
+
+  ffho_xsc:
+    - name: Schlangen
+    - ssid_suffix: schlagen
+    - site: pb_nord
+
+  ffho_stm:
+    - name: Steinheim
+    - ssid_suffix: steinheim
+    - site: hx_nord
+
+  ffho_wag:
+    - name: Warburg
+    - ssid_suffix: wag
+    - site: hx_sued
+
+  ffho_ywl:
+    - name: Willebadessen
+    - ssid_suffix: willebdn
+    - site: hx_sued
+
+  ffho_yho:
+    - name: Umland
+    - ssid_suffix: umland
+    - site: uml

+ 30 - 5
zz_EXAMPLE_PILLAR/sites.sls

@@ -7,18 +7,43 @@ sites:
     prefix_v6: fdca:ffee:ff12:132::/64
 
 
-  # Paderborn City
+  # Paderborn (Kernstadt)
   pad-cty:
     site_no: 1
-    name: Paderborn City
+    name: Paderborn (Kernstadt)
     prefix_v4: 10.132.32.0/20
     prefix_v6: 2a03:2260:2342:100::/64
+    next_node_v4: 10.132.32.1
+    next_node_v6: 2a03:226:2342:100::1
+    domain_seed: <domain seed here>
 
-  # Paderborn Umland
+  # Paderborn (Umland)
   pad-uml:
     site_no: 2
-    name: Paderborn Umland
+    name: Paderborn (Umland)
     prefix_v4: 10.132.48.0/21
     prefix_v6: 2a03:2260:2342:200::/64
+    next_node_v4: 10.132.48.1
+    next_node_v6: 2a03:226:2342:200::1
+    domain_seed: <domain seed here>
 
-  # [...]
+  # Bueren
+  buq:
+    site_no: 3
+    name: Bueren
+    prefix_v4: 10.132.56.0/21
+    prefix_v6: 2a03:2260:2342:300::/64
+    next_node_v4: 10.132.56.1
+    next_node_v6: 2a03:226:2342:300::1
+    domain_seed: <domain seed here>
+
+
+  # Kreis Paderborn
+  pb-nord:
+    site_no: 4
+    name: PB-Nord
+    prefix_v4: 10.132.64.0/21
+    prefix_v6: 2a03:2260:2342:400::/64
+    next_node_v4: 10.132.64.1
+    next_node_v6: 2a03:226:2342:400::1
+    domain_seed: <domain seed here>

+ 13 - 3
zz_EXAMPLE_PILLAR/top.sls

@@ -1,15 +1,22 @@
 base:
   '*':
+    # Site wide options
+    - globals
+
+    - net
     - nodes
     - sites
+    - regions
     - cert
-    - ffho
+
+    # SSH authorized_keys configuration
+    - ssh
 
     #
     # Role/Application specific stuff
 
-    # SSH authorized_keys configuration
-    - ssh
+    # Automatic Certificate Management
+    - acme
 
     # Traffic engineering
     - te
@@ -22,3 +29,6 @@ base:
 
     # Anycast Healthchecker
     - anycast-healthchecker
+
+    # Frontend Config
+    - frontend