openstack: fix bug referencing undefined variable, revert some changes

I had leaked in a couple exception loud-ness changes previously.
This does fix one bug in that os_versions was not defined.

2 files changed, 15 insertions, 13 deletions

diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
index 221759e1..0970d07b 100644
--- a/cloudinit/sources/DataSourceOpenStack.py
+++ b/cloudinit/sources/DataSourceOpenStack.py
@@ -64,13 +64,13 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
 
         try:
             max_wait = int(self.ds_cfg.get("max_wait", max_wait))
-        except Exception as e:
-            LOG.debug("Failed to get max wait. using %s: %s", max_wait, e)
+        except Exception:
+            util.logexc(LOG, "Failed to get max wait. using %s", max_wait)
 
         try:
             timeout = max(0, int(self.ds_cfg.get("timeout", timeout)))
-        except Exception as e:
-            LOG.debug("Failed to get timeout, using %s: %s", timeout, e)
+        except Exception:
+            util.logexc(LOG, "Failed to get timeout, using %s", timeout)
         return (max_wait, timeout)
 
     def wait_for_metadata_service(self):
@@ -82,7 +82,7 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
         if len(filtered):
             urls = filtered
         else:
-            LOG.debug("Empty metadata url list! using default list")
+            LOG.warn("Empty metadata url list! using default list")
             urls = [DEF_MD_URL]
 
         md_urls = []
@@ -123,9 +123,9 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
                                             'version': openstack.OS_HAVANA})
         except openstack.NonReadable:
             return False
-        except (openstack.BrokenMetadata, IOError) as e:
-            LOG.debug("Broken metadata address %s: %s",
-                      self.metadata_address, e)
+        except (openstack.BrokenMetadata, IOError):
+            util.logexc(LOG, "Broken metadata address %s",
+                        self.metadata_address)
             return False
 
         user_dsmode = results.get('dsmode', None)
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index 7b27621c..3c3de7e4 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -178,8 +178,10 @@ class BaseReader(object):
             break
 
         if selected_version != version:
-            LOG.debug("Version '%s' not available, attempting to use"
-                      " version '%s' instead", version, selected_version)
+            LOG.warn("Version '%s' not available, attempting to use "
+                     "version '%s' instead", version, selected_version)
+        else:
+            LOG.debug("Version '%s' was available.", version)
         return selected_version
 
     def _read_content_path(self, item):
@@ -326,7 +328,7 @@ class ConfigDriveReader(BaseReader):
             path = self._path_join(self.base_path, 'openstack')
             found = [d for d in os.listdir(path)
                      if os.path.isdir(os.path.join(path))]
-            self._versions = tuple(found)
+            self._versions = found
         return self._versions
 
     def _read_ec2_metadata(self):
@@ -419,7 +421,7 @@ class MetadataReader(BaseReader):
     def _fetch_available_versions(self):
         # <baseurl>/openstack/ returns a newline separated list of versions
         if self._versions is not None:
-            return self.os_versions
+            return self._versions
         found = []
         version_path = self._path_join(self.base_path, "openstack")
         content = self._path_read(version_path)
@@ -428,7 +430,7 @@ class MetadataReader(BaseReader):
             if not line:
                 continue
             found.append(line)
-        self._versions = tuple(found)
+        self._versions = found
         return self._versions