Sysdeploy/cloud-init-cherrypy
4
0
Fork 2
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Sysdeploy:a2b36e7299222141588c3e319f5bbad203f027a5
Branches Tags
Sysdeploy:master
..
compare: Sysdeploy:95038a060cb6b5ece8e5ab68c2594fe7ad94c35e
Branches Tags
Sysdeploy:master

No commits in common. "a2b36e7299222141588c3e319f5bbad203f027a5" and "95038a060cb6b5ece8e5ab68c2594fe7ad94c35e" have entirely different histories.
a2b36e7299 ... 95038a060c

1 changed files with 18 additions and 25 deletions
Show Stats Expand all files Collapse all files

21
main.py
View File

@ -7,7 +7,6 @@ import configparser
import os import os
import socket import socket
import sys import sys
import uuid as uuid_module
from ipaddress import AddressValueError, IPv4Address, IPv6Address from ipaddress import AddressValueError, IPv4Address, IPv6Address
from os import access, R_OK from os import access, R_OK
@ -34,17 +33,10 @@ class CloudInitRequest:
self.remoteip = None self.remoteip = None
self.hostinfo = ('localhost', ) self.hostinfo = ('localhost', )
self.request = request self.request = request
self.uuid = uuid
self.meta_data = None self.meta_data = None
self.meta_data_loaded = False self.meta_data_loaded = False
self.user_data = None self.user_data = None
try:
self.uuid = str(uuid_module.UUID('{' + uuid + '}'))
# ValueError is wrong UUID syntax
# TypeError is None
except (ValueError, TypeError):
self.uuid = None
self._init_ip() self._init_ip()
self._generate_default_meta_data() self._generate_default_meta_data()
@ -203,7 +195,8 @@ class CloudInitApp:
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):
""" """
@ -301,11 +294,11 @@ 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': {
@ -313,7 +306,7 @@ if __name__ == "__main__":
} }
} }
} }
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()