Commit 24f6a6e6 authored by Guido Trotter's avatar Guido Trotter
Browse files

Revert "Add 2.2->2.3 cluster upgrade function"

This reverts commit 2c9cf6bb

.
The change is better done in objects.py
Signed-off-by: default avatarGuido Trotter <ultrotter@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent f4c9af7a
......@@ -32,7 +32,6 @@ import os.path
import sys
import optparse
import logging
import socket
from ganeti import constants
from ganeti import serializer
......@@ -71,16 +70,6 @@ def SetupLogging():
root_logger.addHandler(stderr_handler)
def Cluster22To23(cluster):
"""Upgrades the cluster object from 2.2 to 2.3.
"""
logging.info("Upgrading the cluster object")
if "primary_ip_family" not in cluster:
# Add primary ip family to config
cluster["primary_ip_family"] = socket.AF_INET
def main():
"""Main program.
......@@ -161,8 +150,6 @@ def main():
elif config_major == 2 and config_minor == 2:
logging.info("No changes necessary")
# TODO: For Ganeti 2.3 uncomment the following line
# Cluster22To23(config_data["cluster"])
else:
raise Error("Configuration version %d.%d.%d not supported by this tool" %
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment