[PATCH 2/2] recipes: Adapt recipes to the netmachineconfig change

Radek Pazdera rpazdera at redhat.com
Thu Aug 23 11:55:35 UTC 2012


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 at redhat.com>
---
 recipes/multicast/multicast-all.xml     |    8 ++++----
 recipes/team/machineconfig-test1.xml    |    7 +++++++
 recipes/team/machineconfig-test2.xml    |    7 +++++++
 recipes/team/netmachineconfig-test1.xml |    7 -------
 recipes/team/netmachineconfig-test2.xml |    7 -------
 recipes/team/recipe_001.xml             |    4 ++--
 recipes/team/recipe_002.xml             |    4 ++--
 7 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 recipes/team/machineconfig-test1.xml
 create mode 100644 recipes/team/machineconfig-test2.xml
 delete mode 100644 recipes/team/netmachineconfig-test1.xml
 delete mode 100644 recipes/team/netmachineconfig-test2.xml

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/machineconfig-test1.xml b/recipes/team/machineconfig-test1.xml
new file mode 100644
index 0000000..1591a01
--- /dev/null
+++ b/recipes/team/machineconfig-test1.xml
@@ -0,0 +1,7 @@
+<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>
+</machineconfig>
diff --git a/recipes/team/machineconfig-test2.xml b/recipes/team/machineconfig-test2.xml
new file mode 100644
index 0000000..10a2cf7
--- /dev/null
+++ b/recipes/team/machineconfig-test2.xml
@@ -0,0 +1,7 @@
+<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>
+</machineconfig>
diff --git a/recipes/team/netmachineconfig-test1.xml b/recipes/team/netmachineconfig-test1.xml
deleted file mode 100644
index dc01321..0000000
--- a/recipes/team/netmachineconfig-test1.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<netmachineconfig>
-  <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>
diff --git a/recipes/team/netmachineconfig-test2.xml b/recipes/team/netmachineconfig-test2.xml
deleted file mode 100644
index 5272314..0000000
--- a/recipes/team/netmachineconfig-test2.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<netmachineconfig>
-  <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>
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>
-- 
1.7.7.6



More information about the LNST-developers mailing list