commit 1a33b6e04aa4a1a9bff61f6aef420aa5c35e2be1
Author: Jiri Pirko <jiri(a)resnulli.us>
Date: Thu Aug 23 15:37:15 2012 +0200
recipes: team: rename forgotten netmachineconfigs
Signed-off-by: Jiri Pirko <jiri(a)resnulli.us>
recipes/team/netconfig-team_ab_002.xml | 38 ++++++++++++++++++++++++++++++++
recipes/team/recipe_001.xml | 4 +-
recipes/team/recipe_002.xml | 4 +-
3 files changed, 42 insertions(+), 4 deletions(-)
---
diff --git a/recipes/team/netconfig-team_ab_002.xml
b/recipes/team/netconfig-team_ab_002.xml
new file mode 100644
index 0000000..d3ed392
--- /dev/null
+++ b/recipes/team/netconfig-team_ab_002.xml
@@ -0,0 +1,38 @@
+<netconfig>
+ <interface id="1" phys_id="1" type="eth">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": -10,
+ "sticky": true
+ }
+ </option>
+ </options>
+ </interface>
+ <interface id="2" phys_id="2" type="eth">
+ <options>
+ <option name="teamd_port_config">
+ {
+ "prio": 100
+ }
+ </option>
+ </options>
+ </interface>
+ <interface id="3" type="team">
+ <options>
+ <option name="teamd_config">
+ {
+ "runner": {"name": "activebackup"},
+ "link_watch": {"name": "ethtool"}
+ }
+ </option>
+ </options>
+ <slaves>
+ <slave id="1"/>
+ <slave id="2"/>
+ </slaves>
+ <addresses>
+ <address value="{$testip}"/>
+ </addresses>
+ </interface>
+</netconfig>
diff --git a/recipes/team/recipe_001.xml b/recipes/team/recipe_001.xml
index b18940e..ad5a536 100644
--- a/recipes/team/recipe_001.xml
+++ b/recipes/team/recipe_001.xml
@@ -4,14 +4,14 @@
<alias name="testip" value="192.168.111.1/24"/>
</define>
<machine id="1">
- <machineconfig source="netmachineconfig-test1.xml"/>
+ <machineconfig source="machineconfig-test1.xml"/>
<netconfig source="netconfig-team_rr.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
</define>
<machine id="2">
- <machineconfig source="netmachineconfig-test2.xml"/>
+ <machineconfig source="machineconfig-test2.xml"/>
<netconfig source="netconfig-team_rr.xml"/>
</machine>
</machines>
diff --git a/recipes/team/recipe_002.xml b/recipes/team/recipe_002.xml
index 0abe1ef..d985507 100644
--- a/recipes/team/recipe_002.xml
+++ b/recipes/team/recipe_002.xml
@@ -4,14 +4,14 @@
<alias name="testip" value="192.168.111.1/24"/>
</define>
<machine id="1">
- <machineconfig source="netmachineconfig-test1.xml"/>
+ <machineconfig source="machineconfig-test1.xml"/>
<netconfig source="netconfig-team_ab_001.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
</define>
<machine id="2">
- <machineconfig source="netmachineconfig-test2.xml"/>
+ <machineconfig source="machineconfig-test2.xml"/>
<netconfig source="netconfig-team_ab_001.xml"/>
</machine>
</machines>
Show replies by date