Revision 054596f0

b/lib/config.py
867 867
      self._last_cluster_serial = self._config_data.cluster.serial_no
868 868

  
869 869
  def _UnlockedGetSsconfValues(self):
870
    """Return the values needed by ssconf.
871

  
872
    @rtype: dict
873
    @return: a dictionary with keys the ssconf names and values their
874
        associated value
875

  
876
    """
877
    node_list = "\n".join(utils.NiceSort(self._UnlockedGetNodeList()))
878
    cluster = self._config_data.cluster
870 879
    return {
871
      "cluster_name": self._config_data.cluster.cluster_name,
872
      "master_ip": self._config_data.cluster.master_ip,
873
      "master_netdev": self._config_data.cluster.master_netdev,
874
      "master_node": self._config_data.cluster.master_node,
880
      constants.SS_CLUSTER_NAME: cluster.cluster_name,
881
      constants.SS_FILE_STORAGE_DIR: cluster.file_storage_dir,
882
      constants.SS_MASTER_IP: cluster.master_ip,
883
      constants.SS_MASTER_NETDEV: cluster.master_netdev,
884
      constants.SS_MASTER_NODE: cluster.master_node,
885
      constants.SS_NODE_LIST: node_list,
875 886
      }
876 887

  
877 888
  @locking.ssynchronized(_config_lock)

Also available in: Unified diff