Hs2Py constants: VNC

[ganeti-local] / lib / constants.py

diff --git a/lib/constants.py b/lib/constants.py
index 9b7b9a7..16ccdbf 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -854,9 +854,8 @@ HT_LXC = _constants.HT_LXC
 HYPER_TYPES = _constants.HYPER_TYPES
 HTS_REQ_PORT = _constants.HTS_REQ_PORT
 
-VNC_BASE_PORT = 5900
-VNC_DEFAULT_BIND_ADDRESS = IP4_ADDRESS_ANY
-
+VNC_BASE_PORT = _constants.VNC_BASE_PORT
+VNC_DEFAULT_BIND_ADDRESS = _constants.VNC_DEFAULT_BIND_ADDRESS
 # NIC types
 HT_NIC_RTL8139 = "rtl8139"
 HT_NIC_NE2K_PCI = "ne2k_pci"
@@ -1116,9 +1115,8 @@ NR_DRAINED = _constants.NR_DRAINED
 NR_OFFLINE = _constants.NR_OFFLINE
 NR_ALL = _constants.NR_ALL
 
-# SSL certificate check constants (in days)
-SSL_CERT_EXPIRATION_WARN = 30
-SSL_CERT_EXPIRATION_ERROR = 7
+SSL_CERT_EXPIRATION_WARN = _constants.SSL_CERT_EXPIRATION_WARN
+SSL_CERT_EXPIRATION_ERROR = _constants.SSL_CERT_EXPIRATION_ERROR
 
 # Allocator framework constants
 IALLOCATOR_VERSION = _constants.IALLOCATOR_VERSION
@@ -1142,16 +1140,14 @@ NODE_EVAC_SEC = _constants.NODE_EVAC_SEC
 NODE_EVAC_ALL = _constants.NODE_EVAC_ALL
 NODE_EVAC_MODES = _constants.NODE_EVAC_MODES
 
-# Job queue
-JOB_QUEUE_VERSION = 1
-JOB_QUEUE_SIZE_HARD_LIMIT = 5000
-JOB_QUEUE_FILES_PERMS = 0640
+JOB_QUEUE_VERSION = _constants.JOB_QUEUE_VERSION
+JOB_QUEUE_SIZE_HARD_LIMIT = _constants.JOB_QUEUE_SIZE_HARD_LIMIT
+JOB_QUEUE_FILES_PERMS = _constants.JOB_QUEUE_FILES_PERMS
 
 JOB_ID_TEMPLATE = r"\d+"
 JOB_FILE_RE = re.compile(r"^job-(%s)$" % JOB_ID_TEMPLATE)
 
-# unchanged job return
-JOB_NOTCHANGED = "nochange"
+JOB_NOTCHANGED = _constants.JOB_NOTCHANGED
 
 # Job status
 JOB_STATUS_QUEUED = _constants.JOB_STATUS_QUEUED
@@ -1186,18 +1182,12 @@ OP_PRIO_HIGH = _constants.OP_PRIO_HIGH
 OP_PRIO_SUBMIT_VALID = _constants.OP_PRIO_SUBMIT_VALID
 OP_PRIO_DEFAULT = _constants.OP_PRIO_DEFAULT
 
-# Lock recalculate mode
-LOCKS_REPLACE = "replace"
-LOCKS_APPEND = "append"
-
-# Lock timeout (sum) before we should go into blocking acquire (still
-# can be reset by priority change); computed as max time (10 hours)
-# before we should actually go into blocking acquire given that we
-# start from default priority level; in seconds
-# TODO
-LOCK_ATTEMPTS_TIMEOUT = 10 * 3600 / (OP_PRIO_DEFAULT - OP_PRIO_HIGHEST)
-LOCK_ATTEMPTS_MAXWAIT = 15.0
-LOCK_ATTEMPTS_MINWAIT = 1.0
+LOCKS_REPLACE = _constants.LOCKS_REPLACE
+LOCKS_APPEND = _constants.LOCKS_APPEND
+
+LOCK_ATTEMPTS_TIMEOUT = _constants.LOCK_ATTEMPTS_TIMEOUT
+LOCK_ATTEMPTS_MAXWAIT = _constants.LOCK_ATTEMPTS_MAXWAIT
+LOCK_ATTEMPTS_MINWAIT = _constants.LOCK_ATTEMPTS_MINWAIT
 
 # Execution log types
 ELOG_MESSAGE = _constants.ELOG_MESSAGE