Revision 78e706bb
| b/lib/client/gnt_cluster.py | ||
|---|---|---|
| 42 | 42 |
from ganeti import uidpool |
| 43 | 43 |
from ganeti import compat |
| 44 | 44 |
from ganeti import netutils |
| 45 |
from ganeti import pathutils |
|
| 45 | 46 |
|
| 46 | 47 |
|
| 47 | 48 |
ON_OPT = cli_option("--on", default=False,
|
| ... | ... | |
| 452 | 453 |
ToStdout(" - default instance allocator: %s", result["default_iallocator"])
|
| 453 | 454 |
ToStdout(" - primary ip version: %d", result["primary_ip_version"])
|
| 454 | 455 |
ToStdout(" - preallocation wipe disks: %s", result["prealloc_wipe_disks"])
|
| 455 |
ToStdout(" - OS search path: %s", utils.CommaJoin(constants.OS_SEARCH_PATH))
|
|
| 456 |
ToStdout(" - OS search path: %s", utils.CommaJoin(pathutils.OS_SEARCH_PATH))
|
|
| 456 | 457 |
|
| 457 | 458 |
ToStdout("Default node parameters:")
|
| 458 | 459 |
_PrintGroupedParams(result["ndparams"], roman=opts.roman_integers) |
| ... | ... | |
| 879 | 880 |
files_to_copy = [] |
| 880 | 881 |
|
| 881 | 882 |
if new_cluster_cert: |
| 882 |
files_to_copy.append(constants.NODED_CERT_FILE)
|
|
| 883 |
files_to_copy.append(pathutils.NODED_CERT_FILE)
|
|
| 883 | 884 |
|
| 884 | 885 |
if new_rapi_cert or rapi_cert_pem: |
| 885 |
files_to_copy.append(constants.RAPI_CERT_FILE)
|
|
| 886 |
files_to_copy.append(pathutils.RAPI_CERT_FILE)
|
|
| 886 | 887 |
|
| 887 | 888 |
if new_spice_cert or spice_cert_pem: |
| 888 |
files_to_copy.append(constants.SPICE_CERT_FILE)
|
|
| 889 |
files_to_copy.append(constants.SPICE_CACERT_FILE)
|
|
| 889 |
files_to_copy.append(pathutils.SPICE_CERT_FILE)
|
|
| 890 |
files_to_copy.append(pathutils.SPICE_CACERT_FILE)
|
|
| 890 | 891 |
|
| 891 | 892 |
if new_confd_hmac_key: |
| 892 |
files_to_copy.append(constants.CONFD_HMAC_KEY)
|
|
| 893 |
files_to_copy.append(pathutils.CONFD_HMAC_KEY)
|
|
| 893 | 894 |
|
| 894 | 895 |
if new_cds or cds: |
| 895 |
files_to_copy.append(constants.CLUSTER_DOMAIN_SECRET_FILE)
|
|
| 896 |
files_to_copy.append(pathutils.CLUSTER_DOMAIN_SECRET_FILE)
|
|
| 896 | 897 |
|
| 897 | 898 |
if files_to_copy: |
| 898 | 899 |
for node_name in ctx.nonmaster_nodes: |
| b/lib/client/gnt_node.py | ||
|---|---|---|
| 36 | 36 |
from ganeti import constants |
| 37 | 37 |
from ganeti import errors |
| 38 | 38 |
from ganeti import netutils |
| 39 |
from ganeti import pathutils |
|
| 39 | 40 |
from cStringIO import StringIO |
| 40 | 41 |
|
| 41 | 42 |
from ganeti import confd |
| ... | ... | |
| 143 | 144 |
|
| 144 | 145 |
assert nodes, "Empty node list" |
| 145 | 146 |
|
| 146 |
cmd = [constants.SETUP_SSH]
|
|
| 147 |
cmd = [pathutils.SETUP_SSH]
|
|
| 147 | 148 |
|
| 148 | 149 |
# Pass --debug|--verbose to the external script if set on our invocation |
| 149 | 150 |
# --debug overrides --verbose |
| ... | ... | |
| 938 | 939 |
status.failure = True |
| 939 | 940 |
|
| 940 | 941 |
node = args[0] |
| 941 |
hmac = utils.ReadFile(constants.CONFD_HMAC_KEY)
|
|
| 942 |
hmac = utils.ReadFile(pathutils.CONFD_HMAC_KEY)
|
|
| 942 | 943 |
filter_callback = confd_client.ConfdFilterCallback(ListDrbdConfdCallback) |
| 943 | 944 |
counting_callback = confd_client.ConfdCountingCallback(filter_callback) |
| 944 | 945 |
cf_client = confd_client.ConfdClient(hmac, [constants.IP4_ADDRESS_LOCALHOST], |
Also available in: Unified diff