Page MenuHomeDevCentral
Files F27159354

D4055.diff
No OneTemporary
Actions

D4055.diff
View Options

diff --git a/map.jinja b/map.jinja
--- a/map.jinja
+++ b/map.jinja
@@ -117,6 +117,7 @@
'cppunit': 'libcppunit-dev',
'djvulibre': 'djvulibre-bin',
'exiftool': 'libimage-exiftool-perl',
+ 'frrouting': 'frr',
'gpg': 'gpg',
'imagemagick': 'imagemagick',
'jpeg-turbo' : 'libjpeg-turbo',
@@ -147,6 +148,7 @@
'cppunit': 'cppunit-devel',
'djvulibre': 'djvulibre',
'exiftool': 'perl-Image-ExifTool',
+ 'frrouting': 'frr',
'jpeg-turbo' : 'libjpeg-turbo',
'librabbitmq': 'librabbitmq',
'lua': 'lua',
@@ -169,6 +171,7 @@
'aspell-fr': 'aspell-fr',
'certbot': 'certbot',
'cppunit': 'cppunit',
+ 'frrouting': 'frr',
'mariadb': 'mariadb',
'mtr': 'mtr',
'sphinx': 'python-sphinx',
@@ -189,6 +192,7 @@
'cppunit': 'cppunit',
'djvulibre': 'djvulibre',
'exiftool': 'p5-Image-ExifTool-devel',
+ 'frrouting': 'frr10',
'gpg': 'gnupg',
'imagemagick': 'ImageMagick6-nox11',
'jpeg-turbo' : 'jpeg-turbo',
diff --git a/roles/router/init.sls b/roles/router/frrouting/config.sls
copy from roles/router/init.sls
copy to roles/router/frrouting/config.sls
--- a/roles/router/init.sls
+++ b/roles/router/frrouting/config.sls
@@ -1,9 +1,6 @@
# -------------------------------------------------------------
-# Salt — Router
+# Salt — Router — FRRouting
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-
-include:
- - .carp
diff --git a/roles/router/frrouting/files/frr.rc b/roles/router/frrouting/files/frr.rc
new file mode 100644
--- /dev/null
+++ b/roles/router/frrouting/files/frr.rc
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------
+# Network — Activate FRRouting with OSPF
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Project: Nasqueron
+# License: Trivial work, not eligible to copyright
+# Source file: roles/router/carp/files/frr.rc
+# -------------------------------------------------------------
+#
+# <auto-generated>
+# This file is managed by our rOPS SaltStack repository.
+#
+# Changes to this file may cause incorrect behavior
+# and will be lost if the state is redeployed.
+# </auto-generated>
+
+frr_enable="YES"
+frr_daemons="zebra ospfd"
diff --git a/roles/router/init.sls b/roles/router/frrouting/init.sls
copy from roles/router/init.sls
copy to roles/router/frrouting/init.sls
--- a/roles/router/init.sls
+++ b/roles/router/frrouting/init.sls
@@ -1,9 +1,12 @@
# -------------------------------------------------------------
-# Salt — Router
+# Salt — Deploy FRRouting
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
+# Created: 2017-01-25
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
include:
- - .carp
+ - .software
+ - .config
+ - .service
diff --git a/roles/router/init.sls b/roles/router/frrouting/service.sls
copy from roles/router/init.sls
copy to roles/router/frrouting/service.sls
--- a/roles/router/init.sls
+++ b/roles/router/frrouting/service.sls
@@ -1,9 +1,17 @@
# -------------------------------------------------------------
-# Salt — Router
+# Salt — Router — FRRouting
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .carp
+{% from "map.jinja" import services with context %}
+
+{% if services.manager == "rc" %}
+
+/etc/rc.conf.d/frr:
+ file.managed:
+ - source: salt://roles/router/frrouting/files/frr.rc
+ - mode: 644
+
+{% endif %}
diff --git a/roles/router/init.sls b/roles/router/frrouting/software.sls
copy from roles/router/init.sls
copy to roles/router/frrouting/software.sls
--- a/roles/router/init.sls
+++ b/roles/router/frrouting/software.sls
@@ -1,9 +1,15 @@
# -------------------------------------------------------------
-# Salt — Router
+# Salt — Router — FRRouting
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Project: Nasqueron
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
-include:
- - .carp
+{% from "map.jinja" import packages with context %}
+
+# -------------------------------------------------------------
+# Install FRRouting
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{{ packages.frrouting }}:
+ pkg.installed
diff --git a/roles/router/init.sls b/roles/router/init.sls
--- a/roles/router/init.sls
+++ b/roles/router/init.sls
@@ -7,3 +7,4 @@
include:
- .carp
+ - .frrouting

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 30, 21:45 (8 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3673906
Default Alt Text
D4055.diff (4 KB)

Event Timeline

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