diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py index 0506b93..7778d0f 100644 --- a/src/opengnsys/modules/server/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py @@ -106,20 +106,25 @@ class OpenGnSysWorker(ServerWorker): """ Sends OGAgent activation notification to OpenGnsys server """ + if os.path.exists ('/scripts/oginit'): + ## estamos en oglive, este modulo no debe cargarse + ## esta lógica la saco de src/opengnsys/linux/operations.py, donde hay un if similar + raise Exception ('Refusing to load within an ogLive image') + e = None # Error info t = 0 # Count of time # Generate random secret to send on activation self.random = ''.join(random.choice(string.ascii_lowercase + string.digits) for _ in range(self.length)) # Ensure cfg has required configuration variables or an exception will be thrown try: - url = self.service.config.get('opengnsys', 'remote') + url = self.service.config.get(self.name, 'remote') except NoOptionError as e: logger.error("Configuration error: {}".format(e)) raise e self.REST = REST(url) # Execution level ('full' by default) try: - self.exec_level = self.service.config.get('opengnsys', 'level') + self.exec_level = self.service.config.get(self.name, 'level') except NoOptionError: self.exec_level = 'full' # Get network interfaces until they are active or timeout (5 minutes) @@ -156,7 +161,7 @@ class OpenGnSysWorker(ServerWorker): logger.warn (str (e)) # Trying to initialize on alternative server, if defined # (used in "exam mode" from the University of Seville) - self.REST = REST(self.service.config.get('opengnsys', 'altremote')) + self.REST = REST(self.service.config.get(self.name, 'altremote')) self.REST.sendMessage('ogagent/started', {'mac': self.interface.mac, 'ip': self.interface.ip, 'secret': self.random, 'ostype': operations.os_type, 'osversion': operations.os_version, 'alt_url': True,