Index: trunk/ippdor/deployment/deploy.py
===================================================================
--- trunk/ippdor/deployment/deploy.py	(revision 32883)
+++ trunk/ippdor/deployment/deploy.py	(revision 32897)
@@ -4,33 +4,6 @@
 Utility executable for IPP Condor deployment
 """
-def hostname():
-    """
-    Get the host name
-    >>> print hostname()
-    neverland
-    """
-    import socket
-    return socket.gethostbyaddr(socket.gethostname())[0].split('.')[0]
-
-# Default values
-class DefaultValues:
-    """
-    This class contains all default values for the IPP Condor deployment
-    """
-    if hostname().startswith('ipp'): # Production cluster
-        svnSourceUrl          = 'https://svn.pan-starrs.ifa.hawaii.edu/repo/ipp/trunk/ippdor/src'
-        targetDirectory       = '/home/panstarrs/ippdor/local/share/python/ipp'
-        targetBinaryDirectory = '/home/panstarrs/ippdor/local/bin'
-    else:
-        svnSourceUrl          = 'file:///home/schastel/svnrepo/ippdor/trunk/src'
-        targetDirectory       = '/home/schastel/local/share/python/ipp'
-        targetBinaryDirectory = '/home/schastel/local/bin'
-
-    def __init__(self):
-        """Not to be used as a class
-        """
-        raise Exception('Not to be used as a class')
-
 import sys
+import os
 import logging
 #optparse Deprecated in python 2.7. Will be replaced by argparse
@@ -39,5 +12,5 @@
 
 if __name__ == '__main__':
-    USAGE = """usage: %prog [options] arg1 arg2
+    USAGE = """usage: %prog [options] <ipp site definition file>
 
 Deploy the Condor-IPP softwares
@@ -53,18 +26,10 @@
                       help = 'Be quiet',
                       default = False)
-    PARSER.add_option( '-s', '--svnSourceUrl',
-                       dest = "svnSourceUrl",
-                       help = 'SVN Source URL [default: %default]',
-                       default = DefaultValues.svnSourceUrl )
-    PARSER.add_option( '-t', '--targetDirectory',
-                       dest = "targetDirectory",
-                       help = 'Target Python Directory for classes [default: %default]',
-                       default = DefaultValues.targetDirectory )
-    PARSER.add_option( '-b', '--targetBinaryDirectory',
-                       dest = "targetBinaryDirectory",
-                       help = 'Target Executables Directory [default: %default]',
-                       default = DefaultValues.targetBinaryDirectory )
     (OPTIONS, ARGS) = PARSER.parse_args()    # ... the values are stored in options
-
+    if len(ARGS) != 1:
+        PARSER.print_help()
+        sys.exit(1)
+    IPP_SITE_FILE = ARGS[0]
+    # Logging setup
     LOGGER = logging.getLogger('ippdor')
     FORMATTER = logging.Formatter('%(asctime)s | %(levelname)7s | %(message)s', 
@@ -81,9 +46,22 @@
     else:
         LOGGER.setLevel(logging.INFO)
+    # Import IppSite definition
+    LOGGER.info('Importing local site definitions')
+    try:
+        os.makedirs('.tmp_site')
+    except OSError:
+        LOGGER.warn('Existing .tmp_site directory')
+    import shutil
+    shutil.copy(IPP_SITE_FILE, '.tmp_site/IppSite.py')
+    INITFILE = open('.tmp_site/__init__.py', 'w')
+    INITFILE.close()
+    sys.path.append('.tmp_site')
+    from IppSite import IppSite
 
+    # Deployment
     try:
-        DEPLOYMENT = Deployment(OPTIONS.svnSourceUrl,
-                                OPTIONS.targetDirectory,
-                                OPTIONS.targetBinaryDirectory)
+        DEPLOYMENT = Deployment(IppSite.SVN_SOURCE_URL,
+                                IppSite.TARGET_DIRECTORY,
+                                IppSite.TARGET_BINARY_DIRECTORY)
         DEPLOYMENT.check()
         DEPLOYMENT.svn_export()
@@ -97,2 +75,8 @@
         import traceback
         traceback.print_exc()
+    # Clean temporary site
+    LOGGER.info('Cleaning temporary site definitions')
+    os.remove('.tmp_site/IppSite.py')
+    os.remove('.tmp_site/IppSite.pyc')
+    os.remove('.tmp_site/__init__.py')
+    os.rmdir('.tmp_site')