Commit 57fd6d0b authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

A few style updates


Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent e56bb0e8
......@@ -6074,9 +6074,6 @@ class LUCreateInstance(LogicalUnit):
else:
network_port = None
##if self.op.vnc_bind_address is None:
## self.op.vnc_bind_address = constants.VNC_DEFAULT_BIND_ADDRESS
# this is needed because os.path.join does not accept None arguments
if self.op.file_storage_dir is None:
string_file_storage_dir = ""
......
......@@ -124,14 +124,15 @@ DAEMONS_SSL = {
# daemon-name: (default-cert-path, default-key-path)
NODED: (SSL_CERT_FILE, SSL_CERT_FILE),
RAPI: (RAPI_CERT_FILE, RAPI_CERT_FILE),
}
}
DAEMONS_PORTS = {
# daemon-name: ("proto", "default-port")
NODED: ("tcp", 1811),
CONFD: ("udp", 1814),
RAPI: ("tcp", 5080),
}
}
DEFAULT_NODED_PORT = DAEMONS_PORTS[NODED][1]
DEFAULT_CONFD_PORT = DAEMONS_PORTS[CONFD][1]
DEFAULT_RAPI_PORT = DAEMONS_PORTS[RAPI][1]
......@@ -148,6 +149,7 @@ DAEMONS_LOGFILES = {
RAPI: LOG_DIR + "rapi-daemon.log",
MASTERD: LOG_DIR + "master-daemon.log",
}
LOG_OS_DIR = LOG_DIR + "os"
LOG_WATCHER = LOG_DIR + "watcher.log"
LOG_COMMANDS = LOG_DIR + "commands.log"
......
......@@ -416,6 +416,7 @@ class HttpServerRequestExecutor(object):
"""
return self.error_message_format % values
class HttpServer(http.HttpBase, asyncore.dispatcher):
"""Generic HTTP server class
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment