Merge pull request #5372 from opensourcerouting/snap-vrrpd

snapcraft: Add vrrpd to the snapcraft package

diff --git a/snapcraft/defaults/vrrpd.conf.default b/snapcraft/defaults/vrrpd.conf.default
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/snapcraft/scripts/Makefile b/snapcraft/scripts/Makefile
index 7ddb7f0769fe12c70bc70582dfa7d1534d550129..0435b3bc52fafcb6379826bd3f5efce0d7cb3ff0 100644 (file)
--- a/snapcraft/scripts/Makefile
+++ b/snapcraft/scripts/Makefile
@@ -18,6 +18,7 @@ install:
        install -D -m 0755 staticd-service $(DESTDIR)/bin/
        install -D -m 0755 bfdd-service $(DESTDIR)/bin/
        install -D -m 0755 fabricd-service $(DESTDIR)/bin/
+       install -D -m 0755 vrrpd-service $(DESTDIR)/bin/
        install -D -m 0755 set-options $(DESTDIR)/bin/
        install -D -m 0755 show_version $(DESTDIR)/bin/
 

diff --git a/snapcraft/scripts/vrrpd-service b/snapcraft/scripts/vrrpd-service
new file mode 100644 (file)
index 0000000..1f60d11
--- /dev/null
+++ b/snapcraft/scripts/vrrpd-service
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e -x
+
+if ! [ -e $SNAP_DATA/vrrpd.conf ]; then
+    cp $SNAP/etc/frr/vrrpd.conf.default $SNAP_DATA/vrrpd.conf
+fi
+exec $SNAP/sbin/vrrpd \
+    -f $SNAP_DATA/vrrpd.conf \
+    --pid_file $SNAP_DATA/vrrpd.pid \
+    --socket $SNAP_DATA/zsock \
+    --vty_socket $SNAP_DATA
+

diff --git a/snapcraft/snapcraft.yaml.in b/snapcraft/snapcraft.yaml.in
index d8071e8cfee596c6572759be050331b130fd9e3c..b06e841f74496c30c042cdd0a3d0d4df0e86a170 100644 (file)
--- a/snapcraft/snapcraft.yaml.in
+++ b/snapcraft/snapcraft.yaml.in
@@ -134,6 +134,13 @@ apps:
             - network
             - network-bind
             - network-control
+    vrrpd:
+        command: bin/vrrpd-service
+        daemon: simple
+        plugs:
+            - network
+            - network-bind
+            - network-control
     set:
         command: bin/set-options
     zebra-debug:
@@ -232,7 +239,12 @@ apps:
             - network
             - network-bind
             - network-control
-
+    vrrpd-debug:
+        command: sbin/vrrpd -f $SNAP_DATA/vrrpd.conf --pid_file $SNAP_DATA/vrrpd.pid --socket $SNAP_DATA/zsock --vty_socket $SNAP_DATA
+        plugs:
+            - network
+            - network-bind
+            - network-control
 parts:
     rtrlib:
         build-packages:
@@ -327,6 +339,7 @@ parts:
             - --enable-fpm
             - --enable-protobuf
             - --enable-rpki
+            - --enable-vrrpd
             - --enable-configfile-mask=0640
             - --enable-logfile-mask=0640 
             - --localstatedir=/var/run
@@ -353,6 +366,7 @@ parts:
             pbrd.conf.default: etc/frr/pbrd.conf.default
             bfdd.conf.default: etc/frr/bfdd.conf.default
             fabricd.conf.default: etc/frr/fabricd.conf.default
+            vrrpd.conf.default: etc/frr/vrrpd.conf.default
             vtysh.conf.default: etc/frr/vtysh.conf.default
             staticd.conf.default: etc/frr/staticd.conf.default
     frr-scripts: