Commit f491c3a8 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Rename constants for SSH init script by Iustin's request.

Reviewed-by: iustinp
parent 26a4b8d7
......@@ -10,9 +10,9 @@ AC_ARG_WITH([ssh-initscript],
[AS_HELP_STRING([--with-ssh-initscript],
[SSH init script to use (default is /etc/init.d/ssh)]
)],
[initd_ssh="$withval"],
[initd_ssh="/etc/init.d/ssh"])
AC_SUBST(INITD_SSH, $initd_ssh)
[ssh_initd_script="$withval"],
[ssh_initd_script="/etc/init.d/ssh"])
AC_SUBST(SSH_INITD_SCRIPT, $ssh_initd_script)
# Check common programs
AC_PROG_INSTALL
......
CLEANFILES = $(nodist_pkgpython_PYTHON) *.py[oc]
SSH_INITD_SCRIPT = @SSH_INITD_SCRIPT@
INITD_SSH = @INITD_SSH@
CLEANFILES = $(nodist_pkgpython_PYTHON) *.py[oc]
nodist_pkgpython_PYTHON = _autoconf.py
pkgpython_PYTHON = __init__.py backend.py cli.py cmdlib.py config.py \
......@@ -15,5 +15,5 @@ _autoconf.py: Makefile
echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
echo "LOCALSTATEDIR = '$(localstatedir)'"; \
echo "SYSCONFDIR = '$(sysconfdir)'"; \
echo "INITD_SSH = '$(INITD_SSH)'"; \
echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
} > $@
......@@ -41,7 +41,6 @@ from ganeti import constants
from ganeti import bdev
from ganeti import objects
from ganeti import ssconf
from ganeti import _autoconf
def StartMaster():
......@@ -121,7 +120,7 @@ def AddNode(dsa, dsapub, rsa, rsapub, sshkey, sshpub):
finally:
f.close()
utils.RunCmd([_autoconf.INITD_SSH, "restart"])
utils.RunCmd([constants.SSH_INITD_SCRIPT, "restart"])
return True
......
......@@ -39,6 +39,7 @@ WATCHER_STATEFILE = DATA_DIR + "/restart_state"
SSH_KNOWN_HOSTS_FILE = DATA_DIR + "/known_hosts"
NODE_INITD_SCRIPT = _autoconf.SYSCONFDIR + "/init.d/ganeti"
SSH_INITD_SCRIPT = _autoconf.SSH_INITD_SCRIPT
DEFAULT_NODED_PORT = 1811
FIRST_DRBD_PORT = 11000
LAST_DRBD_PORT = 14999
......
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