diff options
Diffstat (limited to 'abs/core-testing')
| -rwxr-xr-x | abs/core-testing/LinHES-config/mv_hostype.py | 15 | 
1 files changed, 13 insertions, 2 deletions
| diff --git a/abs/core-testing/LinHES-config/mv_hostype.py b/abs/core-testing/LinHES-config/mv_hostype.py index 5d033fa..d6ec0ed 100755 --- a/abs/core-testing/LinHES-config/mv_hostype.py +++ b/abs/core-testing/LinHES-config/mv_hostype.py @@ -113,7 +113,9 @@ def setup_func_key():  def setup_func_minion(dbhost):      logging.info("    Setting up the func minion:")      logging.debug("   certmaster is %s:",dbhost) -    cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost +    #cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost +    #mv_common.runcmd(cmd) +    cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/certmaster/minion.conf ''' %dbhost      mv_common.runcmd(cmd)  def setup_syslog(dbhost): @@ -140,6 +142,8 @@ def hostypeprint(systemconfig):              setup_db()          install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]          daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"] +        if data_config.SYSTEMTYPE == "MythVantage": +          install_list.append('ghosd')      elif systemconfig["SystemType"] == "Master_backend":          logging.info("Master backend system being configured") @@ -151,8 +155,10 @@ def hostypeprint(systemconfig):          run_mysqlnetwork = True          if data_config.SYSTEMTYPE == "MythVantage":              install_list.append('func') +            daemon_list.append('func')              install_list.append('certmaster')              daemon_list.append('certmaster') +            install_list.append('ghosd')      elif systemconfig["SystemType"] == "Slave_backend":          logging.info("Slave backend  system being configured") @@ -169,6 +175,7 @@ def hostypeprint(systemconfig):              install_list.append('func')              daemon_list.append('funcd')              remove_list.append("lighttpd") +            install_list.append('ghosd')      elif systemconfig["SystemType"] == "Frontend_only": @@ -185,7 +192,7 @@ def hostypeprint(systemconfig):              install_list.append('func')              daemon_list.append('funcd')              remove_list.append("lighttpd") - +            install_list.append('ghosd')      for pkg in install_list: @@ -200,10 +207,14 @@ def hostypeprint(systemconfig):          logging.debug("   Will run the frontend")          mv_common.add_service("frontend")          mv_common.add_service("hal") +        if data_config.SYSTEMTYPE == "MythVantage": +            mv_common.add_service("ghosd")      else:          logging.debug("   Will NOT run the frontend")          mv_common.remove_service("frontend")          mv_common.remove_service("hal") +        if data_config.SYSTEMTYPE == "MythVantage": +            mv_common.remove_service("ghosd")      if run_mysqlnetwork: | 
