diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:26:55 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-06-01 16:26:55 -0700 |
| commit | 84536c188e359a9f046bc8f1c5a3180b3e03ee8b (patch) | |
| tree | f6340cc11042d3c5d76601f0cac896ccaaec0e36 | |
| parent | 9e1f40e27ebf074fd151655557c0de6b6308df92 (diff) | |
| download | vyatta-cfg-quagga-84536c188e359a9f046bc8f1c5a3180b3e03ee8b.tar.gz vyatta-cfg-quagga-84536c188e359a9f046bc8f1c5a3180b3e03ee8b.zip | |
Fix setup of protocols on boot
New CLI appears to require 'update:' rather than 'create:' on
tag nodes in order for them to get applied correctly. Workaround
this by changing all the create: to update: in Quagga config
Bug 4486
5 files changed, 4 insertions, 5 deletions
diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 8e21f914..074388bc 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -5,7 +5,6 @@ comp_help: \1 <1-4294967294>\tAS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" begin: sudo /opt/vyatta/sbin/quagga-manager start bgpd -create: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" # we need to set default parameters in BGP here since we can't do it in # startup scripts as we don't know the AS number at that point update: vyatta-vtysh -c "configure terminal" -c "router bgp $VAR(@)" \ diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def index 8e464dba..b6278e28 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.def @@ -8,7 +8,7 @@ comp_help: syntax:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl \ --check-peer-name $VAR(@)" -create: if /opt/vyatta/sbin/vyatta-bgp.pl --check-if-peer-group \ +update: if /opt/vyatta/sbin/vyatta-bgp.pl --check-if-peer-group \ --peergroup $VAR(@); then vyatta-vtysh -c "configure terminal" \ -c "router bgp $VAR(../@)" \ diff --git a/templates/protocols/ospf/area/node.tag/virtual-link/node.def b/templates/protocols/ospf/area/node.tag/virtual-link/node.def index 614a50cd..b13181b7 100644 --- a/templates/protocols/ospf/area/node.tag/virtual-link/node.def +++ b/templates/protocols/ospf/area/node.tag/virtual-link/node.def @@ -2,7 +2,7 @@ tag: type: ipv4 help: Set a virtual link syntax:expression: ! $VAR(../@) in "0", "0.0.0.0"; "Can't configure VL over area $VAR(../@)" -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"area $VAR(../@) virtual-link $VAR(@)\"; " delete:expression: "vyatta-vtysh -c \"configure terminal\" \ diff --git a/templates/protocols/ospf/neighbor/node.def b/templates/protocols/ospf/neighbor/node.def index e1c9e9e9..dc90d99e 100644 --- a/templates/protocols/ospf/neighbor/node.def +++ b/templates/protocols/ospf/neighbor/node.def @@ -1,7 +1,7 @@ tag: type: ipv4 help: Set neighbor IP address -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"router ospf\" \ -c \"neighbor $VAR(@)\"; " delete:expression: "vyatta-vtysh -c \"configure terminal\" \ diff --git a/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def index eb63a9c2..e04587e1 100644 --- a/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def +++ b/templates/protocols/ospfv3/area/node.tag/filter-list/node.tag/node.def @@ -2,7 +2,7 @@ tag: type: txt help: Set direction of filter (in|out) allowed: echo "in out" -create:expression: "vyatta-vtysh -c \"configure terminal\" \ +update:expression: "vyatta-vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ -c \"area $VAR(../../@) filter-list $VAR(../@) $VAR(@) \"; " delete:expression: "vyatta-vtysh -c \"configure terminal\" \ |