9:16 a.m.
Rootpass parameter is no longer used. This removes it from parser and
also from all example recipes.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
---
lnst/Controller/MachinePool.py | 2 +-
lnst/Controller/NetTestController.py | 1 -
lnst/Controller/NetTestParse.py | 3 ---
recipes/examples/quick_guides/ping_check.xml | 8 ++++----
recipes/multicast/multicast-all.xml | 6 ++----
recipes/team/machineconfig-test1.xml | 2 +-
recipes/team/machineconfig-test2.xml | 2 +-
7 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/lnst/Controller/MachinePool.py b/lnst/Controller/MachinePool.py
index 6b7bf67..7ed6272 100644
--- a/lnst/Controller/MachinePool.py
+++ b/lnst/Controller/MachinePool.py
@@ -119,7 +119,7 @@ class MachinePool:
mcfg = dom.createElement("machineconfig")
info = dom.createElement("info")
- supported = ["hostname", "libvirt_domain",
"rpcport", "rootpass"]
+ supported = ["hostname", "libvirt_domain",
"rpcport"]
for attr_name, attr_val in self._pool[pm_id]["info"].iteritems():
if attr_name in supported:
info.setAttribute(attr_name, attr_val)
diff --git a/lnst/Controller/NetTestController.py b/lnst/Controller/NetTestController.py
index 469db04..b0ffd90 100644
--- a/lnst/Controller/NetTestController.py
+++ b/lnst/Controller/NetTestController.py
@@ -494,7 +494,6 @@ class NetTestController:
logging.info("Retrieving capture files from slaves")
for machine_id in self._recipe["machines"]:
hostname =
self._recipe["machines"][machine_id]['info']['hostname']
- rootpass =
self._recipe["machines"][machine_id]['info']['rootpass']
slave_logging_dir = os.path.join(logging_root, hostname)
try:
diff --git a/lnst/Controller/NetTestParse.py b/lnst/Controller/NetTestParse.py
index 40223f5..03fedd1 100644
--- a/lnst/Controller/NetTestParse.py
+++ b/lnst/Controller/NetTestParse.py
@@ -285,9 +285,6 @@ class MachineConfigParse(RecipeParser):
info["libvirt_domain"] = self._get_attribute(node,
"libvirt_domain")
- if self._has_attribute(node, "rootpass"):
- info["rootpass"] = self._get_attribute(node, "rootpass")
-
if self._has_attribute(node, "rpcport"):
info["rpcport"] = self._get_attribute(node, "rpcport",
int)
diff --git a/recipes/examples/quick_guides/ping_check.xml
b/recipes/examples/quick_guides/ping_check.xml
index 8960b63..9a0022c 100644
--- a/recipes/examples/quick_guides/ping_check.xml
+++ b/recipes/examples/quick_guides/ping_check.xml
@@ -8,8 +8,8 @@ is available on LNST wiki page:
<machines>
<machine id="testmachine1">
<machineconfig>
- <!-- Change hostname and rootpass bellow -->
- <info hostname="192.168.1.2" rootpass="r00t"/>
+ <!-- Change hostname bellow -->
+ <info hostname="192.168.1.2"/>
<netdevices>
<!-- Change hwaddr here -->
<netdevice type="eth" network="tnet"
hwaddr="52:54:01:00:00:05"
@@ -27,8 +27,8 @@ is available on LNST wiki page:
<machine id="testmachine2">
<machineconfig>
- <!-- Change hostname and rootpass bellow -->
- <info hostname="192.168.1.3" rootpass="r00t"/>
+ <!-- Change hostname bellow -->
+ <info hostname="192.168.1.3"/>
<netdevices>
<!-- Change hwaddr here -->
<netdevice type="eth" network="tnet"
hwaddr="52:54:01:00:00:06"
diff --git a/recipes/multicast/multicast-all.xml b/recipes/multicast/multicast-all.xml
index af9aae9..cd8da19 100644
--- a/recipes/multicast/multicast-all.xml
+++ b/recipes/multicast/multicast-all.xml
@@ -11,8 +11,7 @@
<machines>
<machine id="1">
<machineconfig>
- <info hostname="{$hostname1}"
libvirt_domain="{$virtdomain1}"
- rootpass="redhat"/>
+ <info hostname="{$hostname1}"
libvirt_domain="{$virtdomain1}"/>
<netdevices>
<libvirt_create>
<netdevice network="tnet" phys_id="1"
type="eth"/>
@@ -35,8 +34,7 @@
</machine>
<machine id="2">
<machineconfig>
- <info hostname="{$hostname2}"
libvirt_domain="{$virtdomain2}"
- rootpass="redhat"/>
+ <info hostname="{$hostname2}"
libvirt_domain="{$virtdomain2}"/>
<netdevices>
<libvirt_create>
<netdevice network="tnet" phys_id="1"
type="eth"/>
diff --git a/recipes/team/machineconfig-test1.xml b/recipes/team/machineconfig-test1.xml
index 1591a01..ec3062a 100644
--- a/recipes/team/machineconfig-test1.xml
+++ b/recipes/team/machineconfig-test1.xml
@@ -1,5 +1,5 @@
<machineconfig>
- <info hostname="192.168.122.182" rootpass="aaa"/>
+ <info hostname="192.168.122.182"/>
<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"/>
diff --git a/recipes/team/machineconfig-test2.xml b/recipes/team/machineconfig-test2.xml
index 10a2cf7..4c57d2e 100644
--- a/recipes/team/machineconfig-test2.xml
+++ b/recipes/team/machineconfig-test2.xml
@@ -1,5 +1,5 @@
<machineconfig>
- <info hostname="192.168.122.223" rootpass="aaa"/>
+ <info hostname="192.168.122.223"/>
<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"/>
--
1.7.7.6