From 79d653464fa85cf09c98014f82b5874de250944b Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 4 Feb 2016 10:08:20 +0100 Subject: [PATCH 8/8] fence_compute: Deprecate the domain option As far as I understand, this should not be needed anymore: the domain option was really only useful to translate between hypervisor hostname and nova service hostname, and we don't get hypervisor hostnames anywhere anymore. The option is left around to not break existing configurations that are using it. --- fence/agents/compute/fence_compute.py | 8 ++------ tests/data/metadata/fence_compute.xml | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py index 0273aa2..eccab99 100644 --- a/fence/agents/compute/fence_compute.py +++ b/fence/agents/compute/fence_compute.py @@ -257,9 +257,9 @@ def define_new_opts(): all_opt["domain"] = { "getopt" : "d:", "longopt" : "domain", - "help" : "-d, --domain=[string] DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN", + "help" : "-d, --domain=[string] Deprecated option; do not do anything anymore", "required" : "0", - "shortdesc" : "DNS domain in which hosts live", + "shortdesc" : "Deprecated option", "default" : "", "order": 5, } @@ -318,10 +318,6 @@ def main(): except ImportError: fail_usage("nova not found or not accessible") - # Potentially we should make this a pacemaker feature - if options["--action"] != "list" and options["--domain"] != "" and options.has_key("--plug"): - options["--plug"] = options["--plug"] + "." + options["--domain"] - if options["--record-only"] in [ "2", "Disabled", "disabled" ]: sys.exit(0) diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml index e5c112c..82e0fde 100644 --- a/tests/data/metadata/fence_compute.xml +++ b/tests/data/metadata/fence_compute.xml @@ -56,7 +56,7 @@ - DNS domain in which hosts live + Deprecated option -- 2.6.2