# HG changeset patch
# User Drew Fisher <drew.fisher@oracle.com>
# Date 1400601590 25200
# Node ID e4ac7e52627e05dc1bd779ceb956edb542ec1ec1
# Parent  14b1a985dbbb438c911abc85d943b958d0406f58
18793920 nova traceback when provided multiple SMF profiles

diff -r 14b1a985dbbb -r e4ac7e52627e components/openstack/nova/files/solariszones/driver.py
--- a/components/openstack/nova/files/solariszones/driver.py	Mon May 19 23:00:34 2014 -0700
+++ b/components/openstack/nova/files/solariszones/driver.py	Tue May 20 08:59:50 2014 -0700
@@ -903,21 +903,21 @@
         # find all XML files in sc_dir
         for root, dirs, files in os.walk(sc_dir):
             for fname in [f for f in files if f.endswith(".xml")]:
-                root = etree.parse(os.path.join(root, fname))
+                fileroot = etree.parse(os.path.join(root, fname))
 
                 # look for config-user properties
-                if filter(usercheck, root.findall('service')):
+                if filter(usercheck, fileroot.findall('service')):
                     # a service element was found for config-user.  Verify
                     # root's password is set, the admin account name is set and
                     # the admin's password is set
-                    pgs = root.iter('property_group')
+                    pgs = fileroot.iter('property_group')
                     for pg in pgs:
                         if pg.attrib.get('name') == 'root_account':
                             root_account_needed = False
 
                 # look for identity properties
-                if filter(hostcheck, root.findall('service')):
-                    for props in root.iter('propval'):
+                if filter(hostcheck, fileroot.findall('service')):
+                    for props in fileroot.iter('propval'):
                         if props.attrib.get('name') == 'nodename':
                             hostname_needed = False