On Mon, Mar 23, 2015 at 04:46:30PM +0100, 'Klaus Aehlig' via ganeti-devel wrote:
When destroying a cluster, it needs to go to no-master state
first, to ensure daemons will refuse to restart. So, even if
there is no master, we need to provide a value the master entry
in ssconf. The value chosen contains a space character and therefore
cannot be a valid domain name.
Signed-off-by: Klaus Aehlig <[email protected]>
---
src/Ganeti/WConfd/Ssconf.hs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Ganeti/WConfd/Ssconf.hs b/src/Ganeti/WConfd/Ssconf.hs
index 36684d5..a3e30c6 100644
--- a/src/Ganeti/WConfd/Ssconf.hs
+++ b/src/Ganeti/WConfd/Ssconf.hs
@@ -71,7 +71,7 @@ mkSSConf cdata = SSConf $ M.fromList
, (SSMasterNetdev, return $ clusterMasterNetdev cluster)
, (SSMasterNetmask, return . show $ clusterMasterNetmask cluster)
, (SSMasterNode, return
- . genericResult (error "Master node not found") nodeName
+ . genericResult (const "NO MASTER") nodeName
. getNode cdata $ clusterMasterNode cluster)
, (SSNodeList, mapLines nodeName nodes)
, (SSNodePrimaryIps, mapLines (spcPair . (nodeName &&& nodePrimaryIp))
--
2.2.0.rc0.207.ga3a616c
LGTM
