Revision 3311e336
| b/Makefile.am | ||
|---|---|---|
| 1785 | 1785 |
echo "SSH_LOGIN_USER = '$(SSH_LOGIN_USER)'"; \ |
| 1786 | 1786 |
echo "SSH_CONSOLE_USER = '$(SSH_CONSOLE_USER)'"; \ |
| 1787 | 1787 |
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \ |
| 1788 |
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \ |
|
| 1789 |
echo "ES_SEARCH_PATH = [$(ES_SEARCH_PATH)]"; \ |
|
| 1790 | 1788 |
echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \ |
| 1791 | 1789 |
echo "XEN_CONFIG_DIR = '$(XEN_CONFIG_DIR)'"; \ |
| 1792 | 1790 |
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \ |
| 1793 | 1791 |
echo "XEN_INITRD = '$(XEN_INITRD)'"; \ |
| 1794 | 1792 |
echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \ |
| 1795 | 1793 |
echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \ |
| 1796 |
echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \ |
|
| 1797 | 1794 |
echo "KVM_PATH = '$(KVM_PATH)'"; \ |
| 1798 | 1795 |
echo "IP_PATH = '$(IP_PATH)'"; \ |
| 1799 | 1796 |
echo "SOCAT_PATH = '$(SOCAT)'"; \ |
| b/configure.ac | ||
|---|---|---|
| 97 | 97 |
[comma separated list of directories to] |
| 98 | 98 |
[ search for OS images (default is /srv/ganeti/os)] |
| 99 | 99 |
)], |
| 100 |
[os_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`],
|
|
| 101 |
[os_search_path="'/srv/ganeti/os'"])
|
|
| 100 |
[os_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/\1/g"`],
|
|
| 101 |
[os_search_path="/srv/ganeti/os"])
|
|
| 102 | 102 |
AC_SUBST(OS_SEARCH_PATH, $os_search_path) |
| 103 | 103 |
|
| 104 | 104 |
# --with-extstorage-search-path=... |
| ... | ... | |
| 109 | 109 |
[ search for External Storage Providers] |
| 110 | 110 |
[ (default is /srv/ganeti/extstorage)] |
| 111 | 111 |
)], |
| 112 |
[es_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`],
|
|
| 113 |
[es_search_path="'/srv/ganeti/extstorage'"])
|
|
| 112 |
[es_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/\1/g"`],
|
|
| 113 |
[es_search_path="/srv/ganeti/extstorage"])
|
|
| 114 | 114 |
AC_SUBST(ES_SEARCH_PATH, $es_search_path) |
| 115 | 115 |
|
| 116 | 116 |
# --with-iallocator-search-path=... |
| ... | ... | |
| 120 | 120 |
[comma separated list of directories to] |
| 121 | 121 |
[ search for instance allocators (default is $libdir/ganeti/iallocators)] |
| 122 | 122 |
)], |
| 123 |
[iallocator_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/'\1'/g"`],
|
|
| 124 |
[iallocator_search_path="'$libdir/$PACKAGE_NAME/iallocators'"])
|
|
| 123 |
[iallocator_search_path=`echo -n "$withval" | sed -e "s/\([[^,]]*\)/\1/g"`],
|
|
| 124 |
[iallocator_search_path="$libdir/$PACKAGE_NAME/iallocators"])
|
|
| 125 | 125 |
AC_SUBST(IALLOCATOR_SEARCH_PATH, $iallocator_search_path) |
| 126 | 126 |
|
| 127 | 127 |
# --with-xen-bootloader=... |
| b/lib/pathutils.py | ||
|---|---|---|
| 24 | 24 |
""" |
| 25 | 25 |
|
| 26 | 26 |
from ganeti import _autoconf |
| 27 |
from ganeti import _constants |
|
| 27 | 28 |
from ganeti import compat |
| 28 | 29 |
from ganeti import vcluster |
| 29 | 30 |
|
| ... | ... | |
| 35 | 36 |
DEFAULT_SHARED_FILE_STORAGE_DIR = \ |
| 36 | 37 |
vcluster.AddNodePrefix(DEFAULT_SHARED_FILE_STORAGE_DIR) |
| 37 | 38 |
EXPORT_DIR = vcluster.AddNodePrefix(_autoconf.EXPORT_DIR) |
| 38 |
OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
|
|
| 39 |
ES_SEARCH_PATH = _autoconf.ES_SEARCH_PATH
|
|
| 39 |
OS_SEARCH_PATH = _constants.OS_SEARCH_PATH
|
|
| 40 |
ES_SEARCH_PATH = _constants.ES_SEARCH_PATH
|
|
| 40 | 41 |
SSH_CONFIG_DIR = _autoconf.SSH_CONFIG_DIR |
| 41 | 42 |
XEN_CONFIG_DIR = vcluster.AddNodePrefix(_autoconf.XEN_CONFIG_DIR) |
| 42 | 43 |
SYSCONFDIR = vcluster.AddNodePrefix(_autoconf.SYSCONFDIR) |
| b/src/Ganeti/HsConstants.hs | ||
|---|---|---|
| 50 | 50 |
import Ganeti.Types |
| 51 | 51 |
import qualified Ganeti.Types as Types |
| 52 | 52 |
|
| 53 |
-- * Constants for 'lib/pathutils.py' |
|
| 54 |
|
|
| 55 |
osSearchPath :: [String] |
|
| 56 |
osSearchPath = AutoConf.osSearchPath |
|
| 57 |
|
|
| 58 |
esSearchPath :: [String] |
|
| 59 |
esSearchPath = AutoConf.esSearchPath |
|
| 60 |
|
|
| 53 | 61 |
-- * OOB supported commands |
| 54 | 62 |
|
| 55 | 63 |
oobPowerOn :: String |
Also available in: Unified diff