removing unused path_prefix

conf/ztpserver.conf

@@ -20,7 +20,6 @@ disable_topology_validation = False
 
 
 [server]
-
 # Note: this section only applies to using the standalone server.  If 
 # running under a WSGI server, these values are ignored
 
@@ -35,17 +34,16 @@ port = 8080
 [ files]
 # Path for the files directory (overriding data_root/files)
 folder = files
-path_prefix = /usr/share/ztpserver
+
 
 [actions]
 # Path for the actions directory (overriding data_root/actions)
 folder = actions
-path_prefix = /usr/share/ztpserver
+
 
 [bootstrap]
 # Path for the bootstrap directory (overriding data_root/bootstrap)
 folder = bootstrap
-path_prefix = /usr/share/ztpserver
 
 # Bootstrap filename
 filename = bootstrap

docs/config.rst

@@ -107,22 +107,16 @@ If the global configuration file is updated, the server must be restarted in ord
     # Path for the files directory (overriding data_root/files)
     # default=files
     folder=<path>
-    # default=data_root (from above)
-    path_prefix=<path>
 
     [actions]
     # Path for the actions directory (overriding data_root/actions)
     # default=actions
     folder=<path>
-    # default=data_root (from above)
-    path_prefix=<path>
 
     [bootstrap]
     # Path for the bootstrap directory (overriding data_root/bootstrap)
     # default=bootstrap
     folder=<path>
-    # default=data_root (from above)
-    path_prefix=<path>
 
     # Bootstrap filename
     # default=bootstrap

docs/examples.rst

@@ -43,17 +43,14 @@ Global configuration file
     [ files]
     # Path for the files directory (overriding data_root/files)
     folder = files
-    path_prefix = /usr/share/ztpserver
     
     [actions]
     # Path for the actions directory (overriding data_root/actions)
     folder = actions
-    path_prefix = /usr/share/ztpserver
     
     [bootstrap]
     # Path for the bootstrap directory (overriding data_root/bootstrap)
     folder = bootstrap
-    path_prefix = /usr/share/ztpserver
     
     # Bootstrap filename
     filename = bootstrap

ztpserver/config.py

@@ -347,12 +347,6 @@ def read(self, filename):
     environ='ZTPS_FILES_FOLDER'
 ))
 
-runtime.add_attribute(StrAttr(
-    name='path_prefix',
-    group='files',
-    environ='ZTPS_FILES_PATH_PREFIX'
-))
-
 # Group: actions
 runtime.add_attribute(StrAttr(
     name='folder',
@@ -361,12 +355,6 @@ def read(self, filename):
     environ='ZTPS_ACTIONS_FOLDER'
 ))
 
-runtime.add_attribute(StrAttr(
-    name='path_prefix',
-    group='actions',
-    environ='ZTPS_ACTIONS_PATH_PREFIX'
-))
-
 # Group: bootstrap
 runtime.add_attribute(StrAttr(
     name='folder',
@@ -375,12 +363,6 @@ def read(self, filename):
     environ='ZTPS_BOOTSTRAP_FOLDER'
 ))
 
-runtime.add_attribute(StrAttr(
-    name='path_prefix',
-    group='bootstrap',
-    environ='ZTPS_BOOTSTRAP_PATH_PREFIX'
-))
-
 runtime.add_attribute(StrAttr(
     name='filename',
     group='bootstrap',

ztpserver/controller.py

@@ -35,7 +35,6 @@
 import logging
 import os
 import routes
-import urlparse
 
 from string import Template
 from webob.static import FileApp
@@ -812,21 +811,12 @@ class Router(WSGIRouter):
 
     def __init__(self):
         # pylint: disable=E1103,W0142
-
         mapper = routes.Mapper()
 
-        kwargs = {}
-
         url = ztpserver.config.runtime.default.server_url
         log.debug('server URL: %s', url)
-        parts = urlparse.urlsplit(url)
-        if parts.path:
-            path = parts.path[:-1] if parts.path.endswith('/') else parts.path
-            if path:
-                log.debug('path_prefix is %s', path)
-                kwargs['path_prefix'] = path
-
-        with mapper.submapper(**kwargs) as router_mapper:
+
+        with mapper.submapper() as router_mapper:
 
             # configure /bootstrap
             router_mapper.connect('bootstrap', '/bootstrap',