Revision a292020f

b/tools/cfgupgrade
127 127
  options.CONFD_HMAC_KEY = options.data_dir + "/hmac.key"
128 128
  options.CDS_FILE = options.data_dir + "/cluster-domain-secret"
129 129
  options.SSCONF_MASTER_NODE = options.data_dir + "/ssconf_master_node"
130
  options.WATCHER_STATEFILE = options.data_dir + "/watcher.data"
130 131

  
131 132
  SetupLogging()
132 133

  
......
206 207
    if not options.dry_run:
207 208
      os.symlink(options.RAPI_USERS_FILE, options.RAPI_USERS_FILE_PRE24)
208 209

  
210
  # Remove old watcher state file if it exists
211
  if os.path.exists(options.WATCHER_STATEFILE):
212
    logging.info("Removing watcher state file %s", options.WATCHER_STATEFILE)
213
    if not options.dry_run:
214
      utils.RemoveFile(options.WATCHER_STATEFILE)
215

  
209 216
  try:
210 217
    logging.info("Writing configuration file to %s", options.CONFIG_DATA_PATH)
211 218
    utils.WriteFile(file_name=options.CONFIG_DATA_PATH,

Also available in: Unified diff