Revision f491c3a8
| b/configure.ac | ||
|---|---|---|
| 10 | 10 |
[AS_HELP_STRING([--with-ssh-initscript], |
| 11 | 11 |
[SSH init script to use (default is /etc/init.d/ssh)] |
| 12 | 12 |
)], |
| 13 |
[initd_ssh="$withval"],
|
|
| 14 |
[initd_ssh="/etc/init.d/ssh"])
|
|
| 15 |
AC_SUBST(INITD_SSH, $initd_ssh)
|
|
| 13 |
[ssh_initd_script="$withval"],
|
|
| 14 |
[ssh_initd_script="/etc/init.d/ssh"])
|
|
| 15 |
AC_SUBST(SSH_INITD_SCRIPT, $ssh_initd_script)
|
|
| 16 | 16 |
|
| 17 | 17 |
# Check common programs |
| 18 | 18 |
AC_PROG_INSTALL |
| b/lib/Makefile.am | ||
|---|---|---|
| 1 |
CLEANFILES = $(nodist_pkgpython_PYTHON) *.py[oc]
|
|
| 1 |
SSH_INITD_SCRIPT = @SSH_INITD_SCRIPT@
|
|
| 2 | 2 |
|
| 3 |
INITD_SSH = @INITD_SSH@
|
|
| 3 |
CLEANFILES = $(nodist_pkgpython_PYTHON) *.py[oc]
|
|
| 4 | 4 |
|
| 5 | 5 |
nodist_pkgpython_PYTHON = _autoconf.py |
| 6 | 6 |
pkgpython_PYTHON = __init__.py backend.py cli.py cmdlib.py config.py \ |
| ... | ... | |
| 15 | 15 |
echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \ |
| 16 | 16 |
echo "LOCALSTATEDIR = '$(localstatedir)'"; \ |
| 17 | 17 |
echo "SYSCONFDIR = '$(sysconfdir)'"; \ |
| 18 |
echo "INITD_SSH = '$(INITD_SSH)'"; \
|
|
| 18 |
echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
|
|
| 19 | 19 |
} > $@ |
| b/lib/backend.py | ||
|---|---|---|
| 41 | 41 |
from ganeti import bdev |
| 42 | 42 |
from ganeti import objects |
| 43 | 43 |
from ganeti import ssconf |
| 44 |
from ganeti import _autoconf |
|
| 45 | 44 |
|
| 46 | 45 |
|
| 47 | 46 |
def StartMaster(): |
| ... | ... | |
| 121 | 120 |
finally: |
| 122 | 121 |
f.close() |
| 123 | 122 |
|
| 124 |
utils.RunCmd([_autoconf.INITD_SSH, "restart"])
|
|
| 123 |
utils.RunCmd([constants.SSH_INITD_SCRIPT, "restart"])
|
|
| 125 | 124 |
|
| 126 | 125 |
return True |
| 127 | 126 |
|
| b/lib/constants.py | ||
|---|---|---|
| 39 | 39 |
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts" |
| 40 | 40 |
|
| 41 | 41 |
NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti" |
| 42 |
SSH_INITD_SCRIPT = _autoconf.SSH_INITD_SCRIPT |
|
| 42 | 43 |
DEFAULT_NODED_PORT = 1811 |
| 43 | 44 |
FIRST_DRBD_PORT = 11000 |
| 44 | 45 |
LAST_DRBD_PORT = 14999 |
Also available in: Unified diff