Allow env var substitution in include paths

plugins/inventory/float.py

@@ -54,9 +54,11 @@ def _make_identifier(s):
     return s.replace('-', '_')
 
 
-# Returns the absolute path to a file. If the given path is relative,
-# it will be evaluated based on the given path_reference.
+# Returns the absolute path to a file. Environment variables will be
+# substituted. If the given path is relative, it will be evaluated
+# based on the given path_reference.
 def _abspath(path, relative_to='/'):
+    path = os.path.expandvars(path)
     if path.startswith('/'):
         return path
     return os.path.abspath(os.path.join(os.path.dirname(relative_to), path))

scripts/pwgen.py

@@ -19,9 +19,11 @@ EXIT_CHANGED = 1
 EXIT_ERROR = 2
 
 
-# Returns the absolute path to a file. If the given path is relative,
-# it will be evaluated based on the given path_reference.
+# Returns the absolute path to a file. Environment variables will be
+# substituted. If the given path is relative, it will be evaluated
+# based on the given path_reference.
 def _abspath(path, relative_to='/'):
+    path = os.path.expandvars(path)
     if path.startswith('/'):
         return path
     return os.path.abspath(os.path.join(os.path.dirname(relative_to), path))