Merge lp:~nuclearbob/utah/packagedir into lp:utah

[Max Brustkern]

This change adds a packagedir config option that can be used to pull the client and supporting packages from a different directory. It's useful for testing on a system without altering the installed version there. I've tested it as part of such a test.

[Javier Collado (javier.collado)]

I think it's a good idea. Thanks.

review: Approve

=== modified file 'utah/config.py'
--- utah/config.py	2012-12-10 13:01:20 +0000
+++ utah/config.py	2012-12-10 16:36:23 +0000
@@ -107,6 +107,8 @@
     nfsconfigfile=os.path.join('/', 'etc', 'exports'),
     # Default options for NFS shares
     nfsoptions='*(ro,async,no_root_squash,no_subtree_check)',
+    # Directory where utah client and other needed packages reside
+    packagedir=os.path.join('/', 'usr', 'share', 'utah'),
     # Time to wait between power off and power on for physical systems
     powertimeout=15,
     # Default preseed

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-12-06 16:30:34 +0000
+++ utah/provisioning/provisioning.py	2012-12-10 16:36:23 +0000
@@ -349,7 +349,7 @@
             raise UTAHProvisioningException("UTAH package isn't installed")
 
         basename = ('utah-' + deb + '_' + utah_version + '_all.deb')
-        debpath = os.path.join('/usr', 'share', 'utah', basename)
+        debpath = os.path.join(config.packagedir, basename)
         debpath = os.path.normpath(debpath)
         if not os.path.isfile(debpath):
             raise UTAHProvisioningException('UTAH {deb} binary package file '
@@ -364,7 +364,7 @@
         Return the path of the .deb file for the python-jsonschema installed
         as part of the main package.
         """
-        debpath = os.path.join('/usr', 'share', 'utah')
+        debpath = config.packagedir
         deb_file_glob = os.path.join(debpath, 'python-jsonschema_*_all.deb')
         deb_files = glob(deb_file_glob)
         if not deb_files: