---
lib/cmdlib.py | 3 ---
lib/constants.py | 6 ++++--
lib/http/server.py | 1 +
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 3872d7c..102816f 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -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 = ""
diff --git a/lib/constants.py b/lib/constants.py
index 99c669b..d2ad24d 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -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"
diff --git a/lib/http/server.py b/lib/http/server.py
index d7e374c..bb5f021 100644
--- a/lib/http/server.py
+++ b/lib/http/server.py
@@ -416,6 +416,7 @@ class HttpServerRequestExecutor(object):
"""
return self.error_message_format % values
+
class HttpServer(http.HttpBase, asyncore.dispatcher):
"""Generic HTTP server class
--
1.6.4.3
