File 0021-fence_compute-evacuate-update-metadata.patch of Package fence-agents.openSUSE_Leap_42.3_Update
From 52983d5b2198fee3498a93034fae95ba179332b8 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen <oalbrigt@redhat.com> Date: Fri, 8 Dec 2017 11:21:41 +0100 Subject: [PATCH] fence_compute/evacuate: update-metadata --- tests/data/metadata/fence_compute.xml | 31 ++++++++++++++++++++++++++++--- tests/data/metadata/fence_evacuate.xml | 31 ++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/tests/data/metadata/fence_compute.xml b/tests/data/metadata/fence_compute.xml index b3ff95c8..1738c83f 100644 --- a/tests/data/metadata/fence_compute.xml +++ b/tests/data/metadata/fence_compute.xml @@ -59,9 +59,9 @@ <shortdesc lang="en">Region Name</shortdesc> </parameter> <parameter name="tenant_name" unique="0" required="0"> - <getopt mixed="-t, --tenant-name=[tenant]" /> + <getopt mixed="-t, --tenant-name=[name]" /> <content type="string" default="" /> - <shortdesc lang="en">Keystone Admin Tenant</shortdesc> + <shortdesc lang="en">Keystone Admin Tenant or v3 Project</shortdesc> </parameter> <parameter name="username" unique="0" required="0" obsoletes="login"> <getopt mixed="-l, --username=[name]" /> @@ -73,7 +73,32 @@ <content type="boolean" default="False" /> <shortdesc lang="en">Allow Insecure TLS Requests</shortdesc> </parameter> - <parameter name="domain" unique="0" required="0"> + <parameter name="project-domain" unique="0" required="0" deprecated="1"> + <getopt mixed="-d, --project-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 Project Domain</shortdesc> + </parameter> + <parameter name="project_domain" unique="0" required="0" obsoletes="project-domain"> + <getopt mixed="-d, --project-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 Project Domain</shortdesc> + </parameter> + <parameter name="user-domain" unique="0" required="0" deprecated="1"> + <getopt mixed="-u, --user-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 User Domain</shortdesc> + </parameter> + <parameter name="user_domain" unique="0" required="0" obsoletes="user-domain"> + <getopt mixed="-u, --user-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 User Domain</shortdesc> + </parameter> + <parameter name="compute-domain" unique="0" required="0" deprecated="1"> + <getopt mixed="-d, --domain=[string]" /> + <content type="string" /> + <shortdesc lang="en">DNS domain in which hosts live</shortdesc> + </parameter> + <parameter name="domain" unique="0" required="0" obsoletes="compute-domain"> <getopt mixed="-d, --domain=[string]" /> <content type="string" /> <shortdesc lang="en">DNS domain in which hosts live</shortdesc> diff --git a/tests/data/metadata/fence_evacuate.xml b/tests/data/metadata/fence_evacuate.xml index 3e544512..2b430f8e 100644 --- a/tests/data/metadata/fence_evacuate.xml +++ b/tests/data/metadata/fence_evacuate.xml @@ -59,9 +59,9 @@ <shortdesc lang="en">Region Name</shortdesc> </parameter> <parameter name="tenant_name" unique="0" required="0"> - <getopt mixed="-t, --tenant-name=[tenant]" /> + <getopt mixed="-t, --tenant-name=[name]" /> <content type="string" default="" /> - <shortdesc lang="en">Keystone Admin Tenant</shortdesc> + <shortdesc lang="en">Keystone Admin Tenant or v3 Project</shortdesc> </parameter> <parameter name="username" unique="0" required="0" obsoletes="login"> <getopt mixed="-l, --username=[name]" /> @@ -73,7 +73,32 @@ <content type="boolean" default="False" /> <shortdesc lang="en">Allow Insecure TLS Requests</shortdesc> </parameter> - <parameter name="domain" unique="0" required="0"> + <parameter name="project-domain" unique="0" required="0" deprecated="1"> + <getopt mixed="-d, --project-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 Project Domain</shortdesc> + </parameter> + <parameter name="project_domain" unique="0" required="0" obsoletes="project-domain"> + <getopt mixed="-d, --project-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 Project Domain</shortdesc> + </parameter> + <parameter name="user-domain" unique="0" required="0" deprecated="1"> + <getopt mixed="-u, --user-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 User Domain</shortdesc> + </parameter> + <parameter name="user_domain" unique="0" required="0" obsoletes="user-domain"> + <getopt mixed="-u, --user-domain=[name]" /> + <content type="string" default="Default" /> + <shortdesc lang="en">Keystone v3 User Domain</shortdesc> + </parameter> + <parameter name="compute-domain" unique="0" required="0" deprecated="1"> + <getopt mixed="-d, --domain=[string]" /> + <content type="string" /> + <shortdesc lang="en">DNS domain in which hosts live</shortdesc> + </parameter> + <parameter name="domain" unique="0" required="0" obsoletes="compute-domain"> <getopt mixed="-d, --domain=[string]" /> <content type="string" /> <shortdesc lang="en">DNS domain in which hosts live</shortdesc> -- 2.13.6
