3 files changed, 13 insertions, 9 deletions
diff --git a/templates/protocols/ospf/node.def b/templates/protocols/ospf/node.def
index cf71ff05..be8a8111 100644
--- a/templates/protocols/ospf/node.def
+++ b/templates/protocols/ospf/node.def
@@ -1,4 +1,15 @@
 priority: 620
 help: Open Shortest Path First protocol (OSPF) parameters
-create: vtysh -c "configure terminal" -c "router ospf"
-delete: vtysh -c "configure terminal" -c "no router ospf"
+begin: if [ "$COMMIT_ACTION" != DELETE ]; then
+         if [ -n "$VAR(parameters/router-id/@)" ]; then
+           vtysh -c "configure terminal" -c "router ospf" \
+                 -c "ospf router-id $VAR(parameters/router-id/@)"
+         else
+           vtysh -c "configure terminal" -c "router ospf" \
+                 -c "no ospf router-id"
+         fi
+       fi
+end: if [ "$COMMIT_ACTION" == DELETE ]; then
+       vtysh -c "configure terminal" -c "router ospf" -c "no ospf router-id"
+       vtysh -c "configure terminal" -c "no router ospf"
+     fi
diff --git a/templates/protocols/ospf/parameters/node.def b/templates/protocols/ospf/parameters/node.def
index 0864bb0b..c8d4482b 100644
--- a/templates/protocols/ospf/parameters/node.def
+++ b/templates/protocols/ospf/parameters/node.def
@@ -1,2 +1 @@
-priority: 610
 help: OSPF specific parameters
diff --git a/templates/protocols/ospf/parameters/router-id/node.def b/templates/protocols/ospf/parameters/router-id/node.def
index e1b073fe..5f7966e6 100644
--- a/templates/protocols/ospf/parameters/router-id/node.def
+++ b/templates/protocols/ospf/parameters/router-id/node.def
@@ -1,8 +1,2 @@
 type: ipv4
 help: Override the default router identifier
-update:expression: "vtysh -c \"configure terminal\" \
-           -c \"router ospf\" \
-           -c \"ospf router-id $VAR(@)\" "
-delete:expression: "vtysh -c \"configure terminal\" \
-           -c \"router ospf\" \
-           -c \"no ospf router-id \" "