Hs2Py constants: node daemon setup

Add node daemon setup related constants to the Haskell to Python constant generation.

Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Thomas Thrainer <thomasth@google.com>

diff --git a/lib/constants.py b/lib/constants.py
index 197a023..169687b 100644 (file)
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -1519,11 +1519,10 @@ SSH_DAEMON_KEYFILES = {
   SSHK_DSA: (pathutils.SSH_HOST_DSA_PRIV, pathutils.SSH_HOST_DSA_PUB),
   }
 
-# Node daemon setup
-NDS_CLUSTER_NAME = "cluster_name"
-NDS_NODE_DAEMON_CERTIFICATE = "node_daemon_certificate"
-NDS_SSCONF = "ssconf"
-NDS_START_NODE_DAEMON = "start_node_daemon"
+NDS_CLUSTER_NAME = _constants.NDS_CLUSTER_NAME
+NDS_NODE_DAEMON_CERTIFICATE = _constants.NDS_NODE_DAEMON_CERTIFICATE
+NDS_SSCONF = _constants.NDS_SSCONF
+NDS_START_NODE_DAEMON = _constants.NDS_START_NODE_DAEMON
 
 RANDOM_UUID_FILE = _constants.RANDOM_UUID_FILE
 

diff --git a/src/Ganeti/HsConstants.hs b/src/Ganeti/HsConstants.hs
index 874867b..a80282a 100644 (file)
--- a/src/Ganeti/HsConstants.hs
+++ b/src/Ganeti/HsConstants.hs
@@ -3733,6 +3733,20 @@ sshHostRsaPriv = sshConfigDir ++ "/ssh_host_rsa_key"
 sshHostRsaPub :: String
 sshHostRsaPub = sshHostRsaPriv ++ ".pub"
 
+-- * Node daemon setup
+
+ndsClusterName :: String
+ndsClusterName = "cluster_name"
+
+ndsNodeDaemonCertificate :: String
+ndsNodeDaemonCertificate = "node_daemon_certificate"
+
+ndsSsconf :: String
+ndsSsconf = "ssconf"
+
+ndsStartNodeDaemon :: String
+ndsStartNodeDaemon = "start_node_daemon"
+
 -- | Path generating random UUID
 randomUuidFile :: String
 randomUuidFile = ConstantUtils.randomUuidFile