commit f948351f6a5e900506d4513c4ba3d99f60fdc42d
Author: Radek Pazdera <rpazdera(a)redhat.com>
Date: Thu Aug 23 13:55:35 2012 +0200
recipes: Adapt recipes to the netmachineconfig change
I changed the old netmachineconfig tags in all recipes within
the recipe directory.
I couldn't test all the changes though, because I have a different
test setup.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
recipes/multicast/multicast-all.xml | 8 ++++----
...ineconfig-test1.xml => machineconfig-test1.xml} | 4 ++--
...ineconfig-test2.xml => machineconfig-test2.xml} | 4 ++--
recipes/team/recipe_001.xml | 4 ++--
recipes/team/recipe_002.xml | 4 ++--
5 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/recipes/multicast/multicast-all.xml b/recipes/multicast/multicast-all.xml
index f4dc82c..0796059 100644
--- a/recipes/multicast/multicast-all.xml
+++ b/recipes/multicast/multicast-all.xml
@@ -10,7 +10,7 @@
</define>
<machines>
<machine id="1">
- <netmachineconfig>
+ <machineconfig>
<info hostname="{$hostname1}"
libvirt_domain="{$virtdomain1}"
rootpass="redhat"/>
<netdevices>
@@ -19,7 +19,7 @@
<netdevice network="tnet" phys_id="2"
type="eth"/>
</libvirt_create>
</netdevices>
- </netmachineconfig>
+ </machineconfig>
<netconfig>
<interface id="1" phys_id="1"
type="eth">
<addresses>
@@ -34,7 +34,7 @@
</netconfig>
</machine>
<machine id="2">
- <netmachineconfig>
+ <machineconfig>
<info hostname="{$hostname2}"
libvirt_domain="{$virtdomain2}"
rootpass="redhat"/>
<netdevices>
@@ -42,7 +42,7 @@
<netdevice network="tnet" phys_id="1"
type="eth"/>
</libvirt_create>
</netdevices>
- </netmachineconfig>
+ </machineconfig>
<netconfig>
<interface id="1" phys_id="1"
type="eth">
<addresses>
diff --git a/recipes/team/netmachineconfig-test1.xml
b/recipes/team/machineconfig-test1.xml
similarity index 86%
rename from recipes/team/netmachineconfig-test1.xml
rename to recipes/team/machineconfig-test1.xml
index dc01321..1591a01 100644
--- a/recipes/team/netmachineconfig-test1.xml
+++ b/recipes/team/machineconfig-test1.xml
@@ -1,7 +1,7 @@
-<netmachineconfig>
+<machineconfig>
<info hostname="192.168.122.182" rootpass="aaa"/>
<netdevices>
<netdevice type="eth" phys_id="1"
hwaddr="52:54:00:3d:c7:6d" network="testing"/>
<netdevice type="eth" phys_id="2"
hwaddr="52:54:00:73:15:c2" network="testing"/>
</netdevices>
-</netmachineconfig>
+</machineconfig>
diff --git a/recipes/team/netmachineconfig-test2.xml
b/recipes/team/machineconfig-test2.xml
similarity index 86%
rename from recipes/team/netmachineconfig-test2.xml
rename to recipes/team/machineconfig-test2.xml
index 5272314..10a2cf7 100644
--- a/recipes/team/netmachineconfig-test2.xml
+++ b/recipes/team/machineconfig-test2.xml
@@ -1,7 +1,7 @@
-<netmachineconfig>
+<machineconfig>
<info hostname="192.168.122.223" rootpass="aaa"/>
<netdevices>
<netdevice type="eth" phys_id="1"
hwaddr="52:54:00:99:bb:27" network="testing"/>
<netdevice type="eth" phys_id="2"
hwaddr="52:54:00:b7:cc:fb" network="testing"/>
</netdevices>
-</netmachineconfig>
+</machineconfig>
diff --git a/recipes/team/recipe_001.xml b/recipes/team/recipe_001.xml
index ef2f9e7..b18940e 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">
- <netmachineconfig source="netmachineconfig-test1.xml"/>
+ <machineconfig source="netmachineconfig-test1.xml"/>
<netconfig source="netconfig-team_rr.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
</define>
<machine id="2">
- <netmachineconfig source="netmachineconfig-test2.xml"/>
+ <machineconfig source="netmachineconfig-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 232df3b..0abe1ef 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">
- <netmachineconfig source="netmachineconfig-test1.xml"/>
+ <machineconfig source="netmachineconfig-test1.xml"/>
<netconfig source="netconfig-team_ab_001.xml"/>
</machine>
<define>
<alias name="testip" value="192.168.111.2/24"/>
</define>
<machine id="2">
- <netmachineconfig source="netmachineconfig-test2.xml"/>
+ <machineconfig source="netmachineconfig-test2.xml"/>
<netconfig source="netconfig-team_ab_001.xml"/>
</machine>
</machines>
Show replies by date