summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-06-15 11:34:44 -0700
committerStephen Hemminger <shemminger@lenny.localdomain>2009-10-01 13:51:20 -0700
commit83aef96b5eefe8c851f3cac7492b71eed3afe51b (patch)
tree2c56d098f36f4f2c711d2c9a7065a35cdc7f360b /templates
parent78396db2d9b7b7a9f05fb2a27616cf37660b14d7 (diff)
downloadvyatta-cfg-qos-83aef96b5eefe8c851f3cac7492b71eed3afe51b.tar.gz
vyatta-cfg-qos-83aef96b5eefe8c851f3cac7492b71eed3afe51b.zip
Fix update (apply-policy) at end
The $VAR(.) is not set on end node, so have to go hunting for policy type. Related to Bug 4545 (cherry picked from commit 39712bfaf390a4435218a14308cc6efa1a2d39b8)
Diffstat (limited to 'templates')
-rw-r--r--templates/qos-policy/drop-tail/node.def2
-rw-r--r--templates/qos-policy/fair-queue/node.def2
-rw-r--r--templates/qos-policy/network-emulator/node.def2
-rw-r--r--templates/qos-policy/random-detect/node.def2
-rw-r--r--templates/qos-policy/rate-limit/node.def2
-rw-r--r--templates/qos-policy/round-robin/node.def2
-rw-r--r--templates/qos-policy/traffic-limiter/node.def2
-rw-r--r--templates/qos-policy/traffic-shaper/node.def2
8 files changed, 8 insertions, 8 deletions
diff --git a/templates/qos-policy/drop-tail/node.def b/templates/qos-policy/drop-tail/node.def
index 49561c3..1bbb25f 100644
--- a/templates/qos-policy/drop-tail/node.def
+++ b/templates/qos-policy/drop-tail/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/qos-policy/fair-queue/node.def b/templates/qos-policy/fair-queue/node.def
index 15b995a..9af92ed 100644
--- a/templates/qos-policy/fair-queue/node.def
+++ b/templates/qos-policy/fair-queue/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)"
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)"
diff --git a/templates/qos-policy/network-emulator/node.def b/templates/qos-policy/network-emulator/node.def
index 2f383f8..9a89c53 100644
--- a/templates/qos-policy/network-emulator/node.def
+++ b/templates/qos-policy/network-emulator/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/qos-policy/random-detect/node.def b/templates/qos-policy/random-detect/node.def
index f6da04a..7dc1caa 100644
--- a/templates/qos-policy/random-detect/node.def
+++ b/templates/qos-policy/random-detect/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/qos-policy/rate-limit/node.def b/templates/qos-policy/rate-limit/node.def
index 6da6f67..57bf98e 100644
--- a/templates/qos-policy/rate-limit/node.def
+++ b/templates/qos-policy/rate-limit/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/qos-policy/round-robin/node.def b/templates/qos-policy/round-robin/node.def
index 6d15978..4427e1a 100644
--- a/templates/qos-policy/round-robin/node.def
+++ b/templates/qos-policy/round-robin/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/qos-policy/traffic-limiter/node.def b/templates/qos-policy/traffic-limiter/node.def
index 38bd516..f8bdf26 100644
--- a/templates/qos-policy/traffic-limiter/node.def
+++ b/templates/qos-policy/traffic-limiter/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)
diff --git a/templates/qos-policy/traffic-shaper/node.def b/templates/qos-policy/traffic-shaper/node.def
index 4c7b73c..cd7b07d 100644
--- a/templates/qos-policy/traffic-shaper/node.def
+++ b/templates/qos-policy/traffic-shaper/node.def
@@ -5,4 +5,4 @@ syntax:expression: pattern $VAR(@) "^[[:alnum:]][-_[:alnum:]]*$"
; "only alpha-numeric policy name allowed"
create: /opt/vyatta/sbin/vyatta-qos.pl --create-policy $VAR(.) $VAR(@)
delete: /opt/vyatta/sbin/vyatta-qos.pl --delete-policy $VAR(@)
-end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(.) $VAR(@)
+end: /opt/vyatta/sbin/vyatta-qos.pl --apply-policy $VAR(@)