Merge branch 'master' into sfa-geni-v3

diff --combined system/TestPlc.py
index 3170346,f874c11..b3cd412
--- 1/system/TestPlc.py
--- 2/system/TestPlc.py
+++ b/system/TestPlc.py
@@@ -84,7 -84,7 +84,7 @@@ class TestPlc
      default_steps = [
          'show', SEP,
          'vs_delete','timestamp_vs','vs_create', SEP,
-         'plc_install', 'plc_configure', 'plc_start', SEP,
+         'plc_install', 'mod_python', 'plc_configure', 'plc_start', SEP,
          'keys_fetch', 'keys_store', 'keys_clear_known_hosts', SEP,
          'plcapi_urls','speed_up_slices', SEP,
          'initscripts', 'sites', 'nodes', 'slices', 'nodegroups', 'leases', SEP,
@@@ -97,7 -97,7 +97,7 @@@
          'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA,
          'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA,
          'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
 -        'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
 +        'sfi_list@1', 'sfi_show@1', 'sfa_utest@1', SEPSFA,
          # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
          # but as the stress test might take a while, we sometimes missed the debug mode..
          'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
@@@ -633,6 -633,11 +633,11 @@@
          pkgs_string=" ".join(pkgs_list)
          return self.yum_install (pkgs_list)
  
+     ###
+     def mod_python(self):
+         """yum install mod_python, useful on f18 and above so as to avoid broken wsgi"""
+         return self.yum_install ( [ 'mod_python' ] )
+ 
      ### 
      def plc_configure(self):
          "run plc-config-tty"
@@@ -1523,6 -1528,8 +1528,6 @@@
      @auth_sfa_mapper
      def sfi_show(self): pass
      @auth_sfa_mapper
 -    def sfi_slices(self): pass
 -    @auth_sfa_mapper
      def ssh_slice_sfa(self): pass
      @auth_sfa_mapper
      def sfa_delete_user(self): pass