|
 |
daee9b |
diff -uNr a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
|
|
|
daee9b |
--- a/fence/agents/compute/fence_compute.py 2018-03-22 12:34:45.989618362 +0100
|
|
|
daee9b |
+++ b/fence/agents/compute/fence_compute.py 2018-03-22 12:44:11.679816557 +0100
|
|
|
daee9b |
@@ -353,7 +353,7 @@
|
|
|
daee9b |
"default" : "",
|
|
|
daee9b |
"order": 1,
|
|
|
daee9b |
}
|
|
|
daee9b |
- all_opt["user-domain"] = {
|
|
|
daee9b |
+ all_opt["user_domain"] = {
|
|
|
daee9b |
"getopt" : "u:",
|
|
|
daee9b |
"longopt" : "user-domain",
|
|
|
daee9b |
"help" : "-u, --user-domain=[name] Keystone v3 User Domain",
|
|
|
daee9b |
@@ -362,7 +362,7 @@
|
|
|
daee9b |
"default" : "Default",
|
|
|
daee9b |
"order": 2,
|
|
|
daee9b |
}
|
|
|
daee9b |
- all_opt["project-domain"] = {
|
|
|
daee9b |
+ all_opt["project_domain"] = {
|
|
|
daee9b |
"getopt" : "P:",
|
|
|
daee9b |
"longopt" : "project-domain",
|
|
|
daee9b |
"help" : "-d, --project-domain=[name] Keystone v3 Project Domain",
|
|
|
daee9b |
@@ -398,7 +398,7 @@
|
|
|
daee9b |
"default" : "False",
|
|
|
daee9b |
"order": 2,
|
|
|
daee9b |
}
|
|
|
daee9b |
- all_opt["compute-domain"] = {
|
|
|
daee9b |
+ all_opt["domain"] = {
|
|
|
daee9b |
"getopt" : "d:",
|
|
|
daee9b |
"longopt" : "domain",
|
|
|
daee9b |
"help" : "-d, --domain=[string] DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN",
|
|
|
daee9b |
@@ -451,7 +451,7 @@
|
|
|
daee9b |
atexit.register(atexit_handler)
|
|
|
daee9b |
|
|
|
daee9b |
device_opt = ["login", "passwd", "tenant_name", "auth_url", "fabric_fencing",
|
|
|
daee9b |
- "no_login", "no_password", "port", "compute-domain", "project-domain", "user-domain",
|
|
|
daee9b |
+ "no_login", "no_password", "port", "domain", "project_domain", "user_domain",
|
|
|
daee9b |
"no_shared_storage", "endpoint_type", "record_only", "instance_filtering", "insecure", "region_name"]
|
|
|
daee9b |
define_new_opts()
|
|
|
daee9b |
all_opt["shell_timeout"]["default"] = "180"
|
|
|
daee9b |
diff -uNr a/fence/agents/compute/fence_evacuate.py b/fence/agents/compute/fence_evacuate.py
|
|
|
daee9b |
--- a/fence/agents/compute/fence_evacuate.py 2018-03-22 12:34:45.990618353 +0100
|
|
|
daee9b |
+++ b/fence/agents/compute/fence_evacuate.py 2018-03-22 12:44:21.157735516 +0100
|
|
|
daee9b |
@@ -287,7 +287,7 @@
|
|
|
daee9b |
"default" : "",
|
|
|
daee9b |
"order": 1,
|
|
|
daee9b |
}
|
|
|
daee9b |
- all_opt["user-domain"] = {
|
|
|
daee9b |
+ all_opt["user_domain"] = {
|
|
|
daee9b |
"getopt" : "u:",
|
|
|
daee9b |
"longopt" : "user-domain",
|
|
|
daee9b |
"help" : "-u, --user-domain=[name] Keystone v3 User Domain",
|
|
|
daee9b |
@@ -296,7 +296,7 @@
|
|
|
daee9b |
"default" : "Default",
|
|
|
daee9b |
"order": 2,
|
|
|
daee9b |
}
|
|
|
daee9b |
- all_opt["project-domain"] = {
|
|
|
daee9b |
+ all_opt["project_domain"] = {
|
|
|
daee9b |
"getopt" : "P:",
|
|
|
daee9b |
"longopt" : "project-domain",
|
|
|
daee9b |
"help" : "-d, --project-domain=[name] Keystone v3 Project Domain",
|
|
|
daee9b |
@@ -332,7 +332,7 @@
|
|
|
daee9b |
"default" : "False",
|
|
|
daee9b |
"order": 2,
|
|
|
daee9b |
}
|
|
|
daee9b |
- all_opt["compute-domain"] = {
|
|
|
daee9b |
+ all_opt["domain"] = {
|
|
|
daee9b |
"getopt" : "d:",
|
|
|
daee9b |
"longopt" : "domain",
|
|
|
daee9b |
"help" : "-d, --domain=[string] DNS domain in which hosts live, useful when the cluster uses short names and nova uses FQDN",
|
|
|
daee9b |
@@ -363,8 +363,8 @@
|
|
|
daee9b |
atexit.register(atexit_handler)
|
|
|
daee9b |
|
|
|
daee9b |
device_opt = ["login", "passwd", "tenant_name", "auth_url",
|
|
|
daee9b |
- "no_login", "no_password", "port", "compute-domain", "project-domain",
|
|
|
daee9b |
- "user-domain", "no_shared_storage", "endpoint_type",
|
|
|
daee9b |
+ "no_login", "no_password", "port", "domain", "project_domain",
|
|
|
daee9b |
+ "user_domain", "no_shared_storage", "endpoint_type",
|
|
|
daee9b |
"instance_filtering", "insecure", "region_name"]
|
|
|
daee9b |
define_new_opts()
|
|
|
daee9b |
all_opt["shell_timeout"]["default"] = "180"
|