Page MenuHomeDevCentral
Files F25568588

D4068.id10628.diff
No OneTemporary
Actions

D4068.id10628.diff
View Options

diff --git a/roles/router/frrouting/config.sls b/roles/router/frrouting/config.sls
--- a/roles/router/frrouting/config.sls
+++ b/roles/router/frrouting/config.sls
@@ -4,3 +4,20 @@
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+
+{% if grains['id'] == 'router-002' %}
+{% set ospf_router_id = '2.2.2.2' %}
+{% elif grains['id'] == 'router-003' %}
+{% set ospf_router_id = '3.3.3.3' %}
+{% endif %}
+
+/usr/local/etc/frr/frr.conf:
+ file.managed:
+ - source: salt://roles/router/frrouting/files/frr.conf
+ - template: jinja
+ - user: frr
+ - group: frr
+ - mode: 644
+ - context:
+ hostname: {{ grains[ 'id' ] }}
+ router_id: {{ ospf_router_id }}
diff --git a/roles/router/frrouting/files/frr.rc b/roles/router/frrouting/files/frr.conf
copy from roles/router/frrouting/files/frr.rc
copy to roles/router/frrouting/files/frr.conf
--- a/roles/router/frrouting/files/frr.rc
+++ b/roles/router/frrouting/files/frr.conf
@@ -1,9 +1,9 @@
# -------------------------------------------------------------
-# Network — Activate FRRouting with OSPF
+# Network — Configuration VRRouting with OSPF
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/router/carp/files/frr.rc
+# Source file: roles/router/frrouting/files/frr.conf
# -------------------------------------------------------------
#
# <auto-generated>
@@ -13,5 +13,23 @@
# and will be lost if the state is redeployed.
# </auto-generated>
-frr_enable="YES"
-frr_daemons="zebra ospfd"
+frr version 10.5.3
+frr defaults traditional
+hostname {{ hostname }}
+service integrated-vtysh-config
+!
+interface gre1
+ ip ospf area 0.0.0.0
+ ip ospf network point-to-point
+ no ip ospf passive
+exit
+!
+interface vmx0
+ ip ospf area 0.0.0.0
+exit
+!
+router ospf
+ ospf router-id {{ router_id }}
+ passive-interface default
+exit
+!
diff --git a/roles/router/frrouting/files/frr.rc b/roles/router/frrouting/files/frr.rc
--- a/roles/router/frrouting/files/frr.rc
+++ b/roles/router/frrouting/files/frr.rc
@@ -3,7 +3,7 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
-# Source file: roles/router/carp/files/frr.rc
+# Source file: roles/router/frrouting/files/frr.rc
# -------------------------------------------------------------
#
# <auto-generated>

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 17, 17:54 (10 h, 49 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3635216
Default Alt Text
D4068.id10628.diff (2 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator