Revision e0d672fa

b/lib/constants.py
24 24
import re
25 25
import socket
26 26

  
27
from ganeti import _autoconf
28 27
from ganeti import _constants
29 28
from ganeti import _vcsversion
30 29
from ganeti import compat
......
32 31

  
33 32

  
34 33
# various versions
35
RELEASE_VERSION = _autoconf.PACKAGE_VERSION
34
RELEASE_VERSION = _constants.RELEASE_VERSION
36 35
OS_API_V10 = 10
37 36
OS_API_V15 = 15
38 37
OS_API_V20 = 20
......
88 87
  return (major, minor, revision)
89 88

  
90 89

  
91
CONFIG_MAJOR = int(_autoconf.VERSION_MAJOR)
92
CONFIG_MINOR = int(_autoconf.VERSION_MINOR)
93
CONFIG_REVISION = 0
94
CONFIG_VERSION = BuildVersion(CONFIG_MAJOR, CONFIG_MINOR, CONFIG_REVISION)
90
CONFIG_MAJOR = _constants.CONFIG_MAJOR
91
CONFIG_MINOR = _constants.CONFIG_MINOR
92
CONFIG_REVISION = _constants.CONFIG_REVISION
93
CONFIG_VERSION = _constants.CONFIG_VERSION
95 94

  
96 95
#: RPC protocol version
97
PROTOCOL_VERSION = BuildVersion(CONFIG_MAJOR, CONFIG_MINOR, 0)
96
PROTOCOL_VERSION = _constants.PROTOCOL_VERSION
98 97

  
99 98
# user separation
100 99
DAEMONS_GROUP = _constants.DAEMONS_GROUP
......
146 145
SECURE_DIR_MODE = 0700
147 146
SECURE_FILE_MODE = 0600
148 147
ADOPTABLE_BLOCKDEV_ROOT = "/dev/disk/"
149
ENABLE_CONFD = _autoconf.ENABLE_CONFD
150
ENABLE_MOND = _autoconf.ENABLE_MOND
151
ENABLE_SPLIT_QUERY = _autoconf.ENABLE_SPLIT_QUERY
152
ENABLE_RESTRICTED_COMMANDS = _autoconf.ENABLE_RESTRICTED_COMMANDS
148
ENABLE_CONFD = _constants.ENABLE_CONFD
149
ENABLE_MOND = _constants.ENABLE_MOND
150
ENABLE_SPLIT_QUERY = _constants.ENABLE_SPLIT_QUERY
151
ENABLE_RESTRICTED_COMMANDS = _constants.ENABLE_RESTRICTED_COMMANDS
153 152

  
154 153
# SSH constants
155 154
SSH = _constants.SSH
......
246 245
              " -oHostKeyAlias=%%s") % (SSH_LOGIN_USER,
247 246
                                        pathutils.SSH_KNOWN_HOSTS_FILE)
248 247

  
249
KVM_PATH = _autoconf.KVM_PATH
250
KVM_KERNEL = _autoconf.KVM_KERNEL
251
SOCAT_PATH = _autoconf.SOCAT_PATH
252
SOCAT_USE_ESCAPE = _autoconf.SOCAT_USE_ESCAPE
253
SOCAT_USE_COMPRESS = _autoconf.SOCAT_USE_COMPRESS
248
KVM_PATH = _constants.KVM_PATH
249
KVM_KERNEL = _constants.KVM_KERNEL
250
SOCAT_PATH = _constants.SOCAT_PATH
251
SOCAT_USE_ESCAPE = _constants.SOCAT_USE_ESCAPE
252
SOCAT_USE_COMPRESS = _constants.SOCAT_USE_COMPRESS
254 253
SOCAT_ESCAPE_CODE = "0x1d"
255 254

  
256 255
#: Console as SSH command
......
671 670
# Time for an intra-cluster disk transfer to wait for a connection
672 671
DISK_TRANSFER_CONNECT_TIMEOUT = 60
673 672
# Disk index separator
674
DISK_SEPARATOR = _autoconf.DISK_SEPARATOR
675
IP_COMMAND_PATH = _autoconf.IP_PATH
673
DISK_SEPARATOR = _constants.DISK_SEPARATOR
674
IP_COMMAND_PATH = _constants.IP_COMMAND_PATH
676 675

  
677 676
#: Key for job IDs in opcode result
678 677
JOB_IDS_KEY = "jobs"
......
1970 1969
DISK_LD_DEFAULTS = {
1971 1970
  DT_DRBD8: {
1972 1971
    LDP_RESYNC_RATE: CLASSIC_DRBD_SYNC_SPEED,
1973
    LDP_BARRIERS: _autoconf.DRBD_BARRIERS,
1974
    LDP_NO_META_FLUSH: _autoconf.DRBD_NO_META_FLUSH,
1972
    LDP_BARRIERS: _constants.DRBD_BARRIERS,
1973
    LDP_NO_META_FLUSH: _constants.DRBD_NO_META_FLUSH,
1975 1974
    LDP_DEFAULT_METAVG: DEFAULT_VG,
1976 1975
    LDP_DISK_CUSTOM: "",
1977 1976
    LDP_NET_CUSTOM: "",
......
1990 1989
    LDP_MIN_RATE: 4 * 1024, # KiB/s
1991 1990
    },
1992 1991
  DT_PLAIN: {
1993
    LDP_STRIPES: _autoconf.LVM_STRIPECOUNT
1992
    LDP_STRIPES: _constants.LVM_STRIPECOUNT
1994 1993
    },
1995 1994
  DT_FILE: {},
1996 1995
  DT_SHARED_FILE: {},
......
2204 2203
BLOCKDEV_DRIVER_MANUAL = _constants.BLOCKDEV_DRIVER_MANUAL
2205 2204

  
2206 2205
# qemu-img path, required for ovfconverter
2207
QEMUIMG_PATH = _autoconf.QEMUIMG_PATH
2206
QEMUIMG_PATH = _constants.QEMUIMG_PATH
2208 2207

  
2209 2208
# Whether htools was enabled at compilation time
2210
HTOOLS = _autoconf.HTOOLS
2209
HTOOLS = _constants.HTOOLS
2211 2210
# The hail iallocator
2212 2211
IALLOC_HAIL = "hail"
2213 2212

  
......
2302 2301
MOND_TIME_INTERVAL = _constants.MOND_TIME_INTERVAL
2303 2302

  
2304 2303
# Do not re-export imported modules
2305
del re, _vcsversion, _autoconf, _constants, socket, pathutils, compat
2304
del re, _vcsversion, _constants, socket, pathutils, compat
2306 2305

  
2307 2306

  
2308 2307
ALLOCATABLE_KEY = "allocatable"

Also available in: Unified diff