This commit is contained in:
Peter Šurda 2021-12-02 15:50:34 +08:00
parent a51b499cb3
commit a2b36e7299
Signed by untrusted user: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87

33
main.py
View File

@ -134,7 +134,7 @@ class CloudInitRequest:
filename = self._get_filename(META_DATA_FILENAME) filename = self._get_filename(META_DATA_FILENAME)
if filename: if filename:
self._update_meta_data_from_file( self._update_meta_data_from_file(
filename filename
) )
self.meta_data_loaded = True self.meta_data_loaded = True
return self.meta_data return self.meta_data
@ -202,9 +202,8 @@ class CloudInitApp:
@staticmethod @staticmethod
def _wrap_metadata(metadata): def _wrap_metadata(metadata):
return {'ds': { return {'ds': {
'meta_data': metadata 'meta_data': metadata
} }}
}
def _user_data(self, uuid=None): def _user_data(self, uuid=None):
""" """
@ -302,19 +301,19 @@ if __name__ == "__main__":
CONFIG["server"].getint("server_port", 8081) CONFIG["server"].getint("server_port", 8081)
ENGINE = cherrypy.engine ENGINE = cherrypy.engine
current_dir = os.path.dirname(os.path.abspath(__file__)) CURRENT_DIR = os.path.dirname(os.path.abspath(__file__))
config = { CONFIG = {
'/include': { '/include': {
'tools.staticdir.on': True, 'tools.staticdir.on': True,
'tools.staticdir.dir': os.path.join(current_dir, 'tools.staticdir.dir': os.path.join(CURRENT_DIR,
'data', 'data',
'include'), 'include'),
'tools.staticdir.content_types': { 'tools.staticdir.content_types': {
'yml': 'text/yaml' 'yml': 'text/yaml'
} }
} }
} }
cherrypy.tree.mount(ROOT, config=config) cherrypy.tree.mount(ROOT, config=CONFIG)
if hasattr(ENGINE, "signal_handler"): if hasattr(ENGINE, "signal_handler"):
ENGINE.signal_handler.subscribe() ENGINE.signal_handler.subscribe()