diff options
Diffstat (limited to 'cloudinit/sources/DataSourceOVF.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 21 | 
1 files changed, 10 insertions, 11 deletions
| diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index bc13b71a..fec13b93 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -80,19 +80,18 @@ class DataSourceOVF(sources.DataSource):              LOG.debug("No system-product-name found")          elif 'vmware' in system_type.lower():              LOG.debug("VMware Virtualization Platform found") -            if not util.get_cfg_option_bool(self.sys_cfg, -                                        "disable_vmware_customization", -                                        True): +            if not util.get_cfg_option_bool( +                    self.sys_cfg, "disable_vmware_customization", True):                  deployPkgPluginPath = search_file("/usr/lib/vmware-tools",                                                    "libdeployPkgPlugin.so")                  if not deployPkgPluginPath:                      deployPkgPluginPath = search_file("/usr/lib/open-vm-tools",                                                        "libdeployPkgPlugin.so")                  if deployPkgPluginPath: -                    vmwareImcConfigFilePath = util.log_time(logfunc=LOG.debug, -                                      msg="waiting for configuration file", -                                      func=wait_for_imc_cfg_file, -                                      args=("/tmp", "cust.cfg")) +                    vmwareImcConfigFilePath = util.log_time( +                        logfunc=LOG.debug, +                        msg="waiting for configuration file", +                        func=wait_for_imc_cfg_file, args=("/tmp", "cust.cfg"))                  if vmwareImcConfigFilePath:                      LOG.debug("Found VMware DeployPkg Config File at %s" % @@ -373,14 +372,14 @@ def get_properties(contents):      # could also check here that elem.namespaceURI ==      #   "http://schemas.dmtf.org/ovf/environment/1"      propSections = find_child(dom.documentElement, -        lambda n: n.localName == "PropertySection") +                              lambda n: n.localName == "PropertySection")      if len(propSections) == 0:          raise XmlError("No 'PropertySection's")      props = {}      propElems = find_child(propSections[0], -                            (lambda n: n.localName == "Property")) +                           (lambda n: n.localName == "Property"))      for elem in propElems:          key = elem.attributes.getNamedItemNS(envNsURI, "key").value @@ -407,8 +406,8 @@ class XmlError(Exception):  # Used to match classes to dependencies  datasources = ( -  (DataSourceOVF, (sources.DEP_FILESYSTEM, )), -  (DataSourceOVFNet, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)), +    (DataSourceOVF, (sources.DEP_FILESYSTEM, )), +    (DataSourceOVFNet, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),  ) | 
