diff --git a/doc/cli-reference/generated/ch_cli_openstack_commands.xml b/doc/cli-reference/generated/ch_cli_openstack_commands.xml
index 3c1fbfbf04..8397538f1f 100644
--- a/doc/cli-reference/generated/ch_cli_openstack_commands.xml
+++ b/doc/cli-reference/generated/ch_cli_openstack_commands.xml
@@ -58,9 +58,7 @@
                  [--os-password <auth-password>]
                  [--os-endpoint <auth-endpoint>] [--os-url <auth-url>]
                  [--os-token <auth-token>] [--os-project-id <auth-project-id>]
-                 [--os-object-api-version <object-api-version>]
-                 [--os-dns-api-version <dns-api-version>]
-                 [--os-queues-api-version &lt;queues-api-version&gt;]</computeroutput></screen>
+                 [--os-object-api-version &lt;object-api-version&gt;]</computeroutput></screen>
     </section>
     <section xml:id="openstackclient_command_optional">
         <title>openstack optional arguments</title>
@@ -536,28 +534,14 @@
       </para>
     </listitem>
   </varlistentry>
-  <varlistentry>
-    <term><command>--os-dns-api-version &lt;dns-api-version&gt;</command></term>
-    <listitem>
-      <para>
-      DNS API version, default=2 (Env: OS_DNS_API_VERSION)
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--os-queues-api-version &lt;queues-api-version&gt;</command></term>
-    <listitem>
-      <para>
-      Queues API version, default=1 (Env:
-      OS_QUEUES_API_VERSION)
-      </para>
-    </listitem>
-  </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_add_host">
+
+    <section xml:id="openstack_cli_identity_api_v2">
+       <title>OpenStack with Identity API v2 commands</title>
+    <section xml:id="openstackclient_subcommand_aggregate_add_host_with_identity_api_v2">
         <title>openstack aggregate add host</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate add host [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate add host [-h]
                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent] [--prefix PREFIX]
@@ -595,9 +579,9 @@ Add host to aggregate
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_create">
+    <section xml:id="openstackclient_subcommand_aggregate_create_with_identity_api_v2">
         <title>openstack aggregate create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate create [-h]
                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
                                   [-c COLUMN] [--max-width &lt;integer&gt;]
                                   [--noindent] [--prefix PREFIX]
@@ -646,9 +630,9 @@ Create a new aggregate
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_delete">
+    <section xml:id="openstackclient_subcommand_aggregate_delete_with_identity_api_v2">
         <title>openstack aggregate delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate delete [-h] &lt;aggregate&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate delete [-h] &lt;aggregate&gt;</computeroutput></screen>
         <para>
 Delete an existing aggregate
         </para>  <variablelist wordsize="10">
@@ -674,9 +658,9 @@ Delete an existing aggregate
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_list">
+    <section xml:id="openstackclient_subcommand_aggregate_list_with_identity_api_v2">
         <title>openstack aggregate list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate list [-h]
                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent]
@@ -704,9 +688,9 @@ List all aggregates
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_remove_host">
+    <section xml:id="openstackclient_subcommand_aggregate_remove_host_with_identity_api_v2">
         <title>openstack aggregate remove host</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate remove host [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate remove host [-h]
                                        [-f {html,json,json,shell,table,value,yaml,yaml}]
                                        [-c COLUMN] [--max-width &lt;integer&gt;]
                                        [--noindent] [--prefix PREFIX]
@@ -744,9 +728,9 @@ Remove host from aggregate
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_set">
+    <section xml:id="openstackclient_subcommand_aggregate_set_with_identity_api_v2">
         <title>openstack aggregate set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate set [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate set [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX] [--name &lt;name&gt;]
@@ -803,9 +787,9 @@ Set aggregate properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_aggregate_show">
+    <section xml:id="openstackclient_subcommand_aggregate_show_with_identity_api_v2">
         <title>openstack aggregate show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token aggregate show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 aggregate show [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX]
@@ -835,9 +819,9 @@ Display aggregate details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_availability_zone_list">
+    <section xml:id="openstackclient_subcommand_availability_zone_list_with_identity_api_v2">
         <title>openstack availability zone list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token availability zone list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 availability zone list [-h]
                                         [-f {csv,html,json,json,table,value,yaml,yaml}]
                                         [-c COLUMN] [--max-width &lt;integer&gt;]
                                         [--noindent]
@@ -865,9 +849,9 @@ List availability zones and their status
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_backup_create">
+    <section xml:id="openstackclient_subcommand_backup_create_with_identity_api_v2">
         <title>openstack backup create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token backup create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 backup create [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX]
@@ -923,9 +907,9 @@ Create new backup
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_backup_delete">
+    <section xml:id="openstackclient_subcommand_backup_delete_with_identity_api_v2">
         <title>openstack backup delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token backup delete [-h] &lt;backup&gt; [&lt;backup&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 backup delete [-h] &lt;backup&gt; [&lt;backup&gt; ...]</computeroutput></screen>
         <para>
 Delete backup(s)
         </para>  <variablelist wordsize="10">
@@ -951,9 +935,9 @@ Delete backup(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_backup_list">
+    <section xml:id="openstackclient_subcommand_backup_list_with_identity_api_v2">
         <title>openstack backup list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token backup list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 backup list [-h]
                              [-f {csv,html,json,json,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--quote {all,minimal,none,nonnumeric}] [--long]</computeroutput></screen>
@@ -979,9 +963,9 @@ List backups
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_backup_restore">
+    <section xml:id="openstackclient_subcommand_backup_restore_with_identity_api_v2">
         <title>openstack backup restore</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token backup restore [-h] &lt;backup&gt; &lt;volume&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 backup restore [-h] &lt;backup&gt; &lt;volume&gt;</computeroutput></screen>
         <para>
 Restore backup
         </para>  <variablelist wordsize="10">
@@ -1015,9 +999,9 @@ Restore backup
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_backup_show">
+    <section xml:id="openstackclient_subcommand_backup_show_with_identity_api_v2">
         <title>openstack backup show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token backup show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 backup show [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX]
@@ -1047,9 +1031,9 @@ Display backup details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_catalog_list">
+    <section xml:id="openstackclient_subcommand_catalog_list_with_identity_api_v2">
         <title>openstack catalog list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token catalog list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 catalog list [-h]
                               [-f {csv,html,json,json,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
@@ -1067,9 +1051,9 @@ List services in the service catalog
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_catalog_show">
+    <section xml:id="openstackclient_subcommand_catalog_show_with_identity_api_v2">
         <title>openstack catalog show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token catalog show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 catalog show [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX]
@@ -1099,9 +1083,9 @@ Display service catalog details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_command_list">
+    <section xml:id="openstackclient_subcommand_command_list_with_identity_api_v2">
         <title>openstack command list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token command list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 command list [-h]
                               [-f {csv,html,json,json,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
@@ -1119,9 +1103,9 @@ List recognized commands by group
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_compute_agent_create">
+    <section xml:id="openstackclient_subcommand_compute_agent_create_with_identity_api_v2">
         <title>openstack compute agent create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token compute agent create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 compute agent create [-h]
                                       [-f {html,json,json,shell,table,value,yaml,yaml}]
                                       [-c COLUMN] [--max-width &lt;integer&gt;]
                                       [--noindent] [--prefix PREFIX]
@@ -1192,9 +1176,9 @@ Create compute agent command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_compute_agent_delete">
+    <section xml:id="openstackclient_subcommand_compute_agent_delete_with_identity_api_v2">
         <title>openstack compute agent delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token compute agent delete [-h] &lt;id&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 compute agent delete [-h] &lt;id&gt;</computeroutput></screen>
         <para>
 Delete compute agent command
         </para>  <variablelist wordsize="10">
@@ -1220,9 +1204,9 @@ Delete compute agent command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_compute_agent_list">
+    <section xml:id="openstackclient_subcommand_compute_agent_list_with_identity_api_v2">
         <title>openstack compute agent list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token compute agent list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 compute agent list [-h]
                                     [-f {csv,html,json,json,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent]
@@ -1250,9 +1234,9 @@ List compute agent command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_compute_agent_set">
+    <section xml:id="openstackclient_subcommand_compute_agent_set_with_identity_api_v2">
         <title>openstack compute agent set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token compute agent set [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 compute agent set [-h]
                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
                                    [-c COLUMN] [--max-width &lt;integer&gt;]
                                    [--noindent] [--prefix PREFIX]
@@ -1306,9 +1290,9 @@ Set compute agent command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_compute_service_list">
+    <section xml:id="openstackclient_subcommand_compute_service_list_with_identity_api_v2">
         <title>openstack compute service list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token compute service list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 compute service list [-h]
                                       [-f {csv,html,json,json,table,value,yaml,yaml}]
                                       [-c COLUMN] [--max-width &lt;integer&gt;]
                                       [--noindent]
@@ -1344,9 +1328,9 @@ List service command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_compute_service_set">
+    <section xml:id="openstackclient_subcommand_compute_service_set_with_identity_api_v2">
         <title>openstack compute service set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token compute service set [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 compute service set [-h]
                                      [-f {csv,html,json,json,table,value,yaml,yaml}]
                                      [-c COLUMN] [--max-width &lt;integer&gt;]
                                      [--noindent]
@@ -1402,9 +1386,9 @@ Set service command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_configuration_show">
+    <section xml:id="openstackclient_subcommand_configuration_show_with_identity_api_v2">
         <title>openstack configuration show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token configuration show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 configuration show [-h]
                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent] [--prefix PREFIX]
@@ -1439,9 +1423,9 @@ Display configuration details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_console_log_show">
+    <section xml:id="openstackclient_subcommand_console_log_show_with_identity_api_v2">
         <title>openstack console log show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token console log show [-h] [--lines &lt;num-lines&gt;] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 console log show [-h] [--lines &lt;num-lines&gt;] &lt;server&gt;</computeroutput></screen>
         <para>
 Show server's console output
         </para>  <variablelist wordsize="10">
@@ -1476,9 +1460,9 @@ Show server's console output
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_console_url_show">
+    <section xml:id="openstackclient_subcommand_console_url_show_with_identity_api_v2">
         <title>openstack console url show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token console url show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 console url show [-h]
                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
                                   [-c COLUMN] [--max-width &lt;integer&gt;]
                                   [--noindent] [--prefix PREFIX]
@@ -1533,9 +1517,9 @@ Show server's remote console URL
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_container_create">
+    <section xml:id="openstackclient_subcommand_container_create_with_identity_api_v2">
         <title>openstack container create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token container create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 container create [-h]
                                   [-f {csv,html,json,json,table,value,yaml,yaml}]
                                   [-c COLUMN] [--max-width &lt;integer&gt;]
                                   [--noindent]
@@ -1566,9 +1550,9 @@ Create new container
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_container_delete">
+    <section xml:id="openstackclient_subcommand_container_delete_with_identity_api_v2">
         <title>openstack container delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token container delete [-h] &lt;container&gt; [&lt;container&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 container delete [-h] &lt;container&gt; [&lt;container&gt; ...]</computeroutput></screen>
         <para>
 Delete container
         </para>  <variablelist wordsize="10">
@@ -1594,9 +1578,9 @@ Delete container
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_container_list">
+    <section xml:id="openstackclient_subcommand_container_list_with_identity_api_v2">
         <title>openstack container list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token container list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 container list [-h]
                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent]
@@ -1666,9 +1650,9 @@ List containers
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_container_save">
+    <section xml:id="openstackclient_subcommand_container_save_with_identity_api_v2">
         <title>openstack container save</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token container save [-h] &lt;container&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 container save [-h] &lt;container&gt;</computeroutput></screen>
         <para>
 Save container contents locally
         </para>  <variablelist wordsize="10">
@@ -1694,9 +1678,9 @@ Save container contents locally
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_container_show">
+    <section xml:id="openstackclient_subcommand_container_show_with_identity_api_v2">
         <title>openstack container show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token container show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 container show [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX]
@@ -1726,9 +1710,9 @@ Display container details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ec2_credentials_create">
+    <section xml:id="openstackclient_subcommand_ec2_credentials_create_with_identity_api_v2">
         <title>openstack ec2 credentials create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ec2 credentials create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ec2 credentials create [-h]
                                         [-f {html,json,json,shell,table,value,yaml,yaml}]
                                         [-c COLUMN] [--max-width &lt;integer&gt;]
                                         [--noindent] [--prefix PREFIX]
@@ -1765,9 +1749,9 @@ Create EC2 credentials
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ec2_credentials_delete">
+    <section xml:id="openstackclient_subcommand_ec2_credentials_delete_with_identity_api_v2">
         <title>openstack ec2 credentials delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ec2 credentials delete [-h] [--user &lt;user&gt;] &lt;access-key&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ec2 credentials delete [-h] [--user &lt;user&gt;] &lt;access-key&gt;</computeroutput></screen>
         <para>
 Delete EC2 credentials
         </para>  <variablelist wordsize="10">
@@ -1801,9 +1785,9 @@ Delete EC2 credentials
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ec2_credentials_list">
+    <section xml:id="openstackclient_subcommand_ec2_credentials_list_with_identity_api_v2">
         <title>openstack ec2 credentials list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ec2 credentials list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ec2 credentials list [-h]
                                       [-f {csv,html,json,json,table,value,yaml,yaml}]
                                       [-c COLUMN] [--max-width &lt;integer&gt;]
                                       [--noindent]
@@ -1831,9 +1815,9 @@ List EC2 credentials
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ec2_credentials_show">
+    <section xml:id="openstackclient_subcommand_ec2_credentials_show_with_identity_api_v2">
         <title>openstack ec2 credentials show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ec2 credentials show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ec2 credentials show [-h]
                                       [-f {html,json,json,shell,table,value,yaml,yaml}]
                                       [-c COLUMN] [--max-width &lt;integer&gt;]
                                       [--noindent] [--prefix PREFIX]
@@ -1872,9 +1856,9 @@ Display EC2 credentials details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_endpoint_create">
+    <section xml:id="openstackclient_subcommand_endpoint_create_with_identity_api_v2">
         <title>openstack endpoint create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token endpoint create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 endpoint create [-h]
                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
                                  [-c COLUMN] [--max-width &lt;integer&gt;]
                                  [--noindent] [--prefix PREFIX] --publicurl
@@ -1938,9 +1922,9 @@ Create new endpoint
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_endpoint_delete">
+    <section xml:id="openstackclient_subcommand_endpoint_delete_with_identity_api_v2">
         <title>openstack endpoint delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token endpoint delete [-h] &lt;endpoint-id&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 endpoint delete [-h] &lt;endpoint-id&gt;</computeroutput></screen>
         <para>
 Delete endpoint
         </para>  <variablelist wordsize="10">
@@ -1966,9 +1950,9 @@ Delete endpoint
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_endpoint_list">
+    <section xml:id="openstackclient_subcommand_endpoint_list_with_identity_api_v2">
         <title>openstack endpoint list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token endpoint list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 endpoint list [-h]
                                [-f {csv,html,json,json,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent]
@@ -1996,9 +1980,9 @@ List endpoints
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_endpoint_show">
+    <section xml:id="openstackclient_subcommand_endpoint_show_with_identity_api_v2">
         <title>openstack endpoint show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token endpoint show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 endpoint show [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX]
@@ -2028,9 +2012,9 @@ Display endpoint details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_extension_list">
+    <section xml:id="openstackclient_subcommand_extension_list_with_identity_api_v2">
         <title>openstack extension list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token extension list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 extension list [-h]
                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent]
@@ -2091,9 +2075,9 @@ List API extensions
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_flavor_create">
+    <section xml:id="openstackclient_subcommand_flavor_create_with_identity_api_v2">
         <title>openstack flavor create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token flavor create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 flavor create [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX] [--id &lt;id&gt;]
@@ -2200,9 +2184,9 @@ Create new flavor
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_flavor_delete">
+    <section xml:id="openstackclient_subcommand_flavor_delete_with_identity_api_v2">
         <title>openstack flavor delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token flavor delete [-h] &lt;flavor&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 flavor delete [-h] &lt;flavor&gt;</computeroutput></screen>
         <para>
 Delete flavor
         </para>  <variablelist wordsize="10">
@@ -2228,9 +2212,9 @@ Delete flavor
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_flavor_list">
+    <section xml:id="openstackclient_subcommand_flavor_list_with_identity_api_v2">
         <title>openstack flavor list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token flavor list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 flavor list [-h]
                              [-f {csv,html,json,json,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--quote {all,minimal,none,nonnumeric}]
@@ -2281,9 +2265,9 @@ List flavors
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_flavor_set">
+    <section xml:id="openstackclient_subcommand_flavor_set_with_identity_api_v2">
         <title>openstack flavor set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token flavor set [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 flavor set [-h]
                             [-f {html,json,json,shell,table,value,yaml,yaml}]
                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                             [--prefix PREFIX] [--property &lt;key=value&gt;]
@@ -2322,9 +2306,9 @@ Set flavor properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_flavor_show">
+    <section xml:id="openstackclient_subcommand_flavor_show_with_identity_api_v2">
         <title>openstack flavor show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token flavor show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 flavor show [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX]
@@ -2354,9 +2338,9 @@ Display flavor details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_flavor_unset">
+    <section xml:id="openstackclient_subcommand_flavor_unset_with_identity_api_v2">
         <title>openstack flavor unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token flavor unset [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 flavor unset [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX] --property &lt;key&gt;
@@ -2395,9 +2379,9 @@ Unset flavor properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_host_list">
+    <section xml:id="openstackclient_subcommand_host_list_with_identity_api_v2">
         <title>openstack host list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token host list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 host list [-h]
                            [-f {csv,html,json,json,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--quote {all,minimal,none,nonnumeric}]
@@ -2424,9 +2408,9 @@ List host command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_host_show">
+    <section xml:id="openstackclient_subcommand_host_show_with_identity_api_v2">
         <title>openstack host show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token host show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 host show [-h]
                            [-f {csv,html,json,json,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--quote {all,minimal,none,nonnumeric}]
@@ -2456,9 +2440,9 @@ Show host command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_hypervisor_list">
+    <section xml:id="openstackclient_subcommand_hypervisor_list_with_identity_api_v2">
         <title>openstack hypervisor list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token hypervisor list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 hypervisor list [-h]
                                  [-f {csv,html,json,json,table,value,yaml,yaml}]
                                  [-c COLUMN] [--max-width &lt;integer&gt;]
                                  [--noindent]
@@ -2486,9 +2470,9 @@ List hypervisors
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_hypervisor_show">
+    <section xml:id="openstackclient_subcommand_hypervisor_show_with_identity_api_v2">
         <title>openstack hypervisor show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token hypervisor show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 hypervisor show [-h]
                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
                                  [-c COLUMN] [--max-width &lt;integer&gt;]
                                  [--noindent] [--prefix PREFIX]
@@ -2518,9 +2502,9 @@ Display hypervisor details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_hypervisor_stats_show">
+    <section xml:id="openstackclient_subcommand_hypervisor_stats_show_with_identity_api_v2">
         <title>openstack hypervisor stats show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token hypervisor stats show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 hypervisor stats show [-h]
                                        [-f {html,json,json,shell,table,value,yaml,yaml}]
                                        [-c COLUMN] [--max-width &lt;integer&gt;]
                                        [--noindent] [--prefix PREFIX]</computeroutput></screen>
@@ -2538,9 +2522,9 @@ Display hypervisor stats details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_add_project">
+    <section xml:id="openstackclient_subcommand_image_add_project_with_identity_api_v2">
         <title>openstack image add project</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image add project [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image add project [-h]
                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
                                    [-c COLUMN] [--max-width &lt;integer&gt;]
                                    [--noindent] [--prefix PREFIX]
@@ -2589,9 +2573,9 @@ Associate project with image
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_create">
+    <section xml:id="openstackclient_subcommand_image_create_with_identity_api_v2">
         <title>openstack image create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image create [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX] [--id &lt;id&gt;]
@@ -2725,9 +2709,9 @@ Create/upload an image
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_delete">
+    <section xml:id="openstackclient_subcommand_image_delete_with_identity_api_v2">
         <title>openstack image delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image delete [-h] &lt;image&gt; [&lt;image&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image delete [-h] &lt;image&gt; [&lt;image&gt; ...]</computeroutput></screen>
         <para>
 Delete image(s)
         </para>  <variablelist wordsize="10">
@@ -2753,9 +2737,9 @@ Delete image(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_list">
+    <section xml:id="openstackclient_subcommand_image_list_with_identity_api_v2">
         <title>openstack image list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image list [-h]
                             [-f {csv,html,json,json,table,value,yaml,yaml}]
                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                             [--quote {all,minimal,none,nonnumeric}]
@@ -2826,9 +2810,9 @@ List available images
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_remove_project">
+    <section xml:id="openstackclient_subcommand_image_remove_project_with_identity_api_v2">
         <title>openstack image remove project</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image remove project [-h] [--project-domain &lt;project-domain&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image remove project [-h] [--project-domain &lt;project-domain&gt;]
                                       &lt;image&gt; &lt;project&gt;</computeroutput></screen>
         <para>
 Disassociate project with image
@@ -2873,9 +2857,9 @@ Disassociate project with image
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_save">
+    <section xml:id="openstackclient_subcommand_image_save_with_identity_api_v2">
         <title>openstack image save</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image save [-h] [--file &lt;filename&gt;] &lt;image&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image save [-h] [--file &lt;filename&gt;] &lt;image&gt;</computeroutput></screen>
         <para>
 Save an image locally
         </para>  <variablelist wordsize="10">
@@ -2909,9 +2893,9 @@ Save an image locally
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_set">
+    <section xml:id="openstackclient_subcommand_image_set_with_identity_api_v2">
         <title>openstack image set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image set [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image set [-h]
                            [-f {html,json,json,shell,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--prefix PREFIX] [--name &lt;name&gt;]
@@ -3069,9 +3053,9 @@ Set image properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_image_show">
+    <section xml:id="openstackclient_subcommand_image_show_with_identity_api_v2">
         <title>openstack image show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token image show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 image show [-h]
                             [-f {html,json,json,shell,table,value,yaml,yaml}]
                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                             [--prefix PREFIX]
@@ -3101,9 +3085,9 @@ Display image details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_fixed_add">
+    <section xml:id="openstackclient_subcommand_ip_fixed_add_with_identity_api_v2">
         <title>openstack ip fixed add</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip fixed add [-h] &lt;network&gt; &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip fixed add [-h] &lt;network&gt; &lt;server&gt;</computeroutput></screen>
         <para>
 Add fixed-ip command
         </para>  <variablelist wordsize="10">
@@ -3137,9 +3121,9 @@ Add fixed-ip command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_fixed_remove">
+    <section xml:id="openstackclient_subcommand_ip_fixed_remove_with_identity_api_v2">
         <title>openstack ip fixed remove</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip fixed remove [-h] &lt;ip-address&gt; &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip fixed remove [-h] &lt;ip-address&gt; &lt;server&gt;</computeroutput></screen>
         <para>
 Remove fixed-ip command
         </para>  <variablelist wordsize="10">
@@ -3173,9 +3157,9 @@ Remove fixed-ip command
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_floating_add">
+    <section xml:id="openstackclient_subcommand_ip_floating_add_with_identity_api_v2">
         <title>openstack ip floating add</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip floating add [-h] &lt;ip-address&gt; &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip floating add [-h] &lt;ip-address&gt; &lt;server&gt;</computeroutput></screen>
         <para>
 Add floating-ip to server
         </para>  <variablelist wordsize="10">
@@ -3209,9 +3193,9 @@ Add floating-ip to server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_floating_create">
+    <section xml:id="openstackclient_subcommand_ip_floating_create_with_identity_api_v2">
         <title>openstack ip floating create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip floating create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip floating create [-h]
                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent] [--prefix PREFIX]
@@ -3241,9 +3225,9 @@ Create new floating-ip
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_floating_delete">
+    <section xml:id="openstackclient_subcommand_ip_floating_delete_with_identity_api_v2">
         <title>openstack ip floating delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip floating delete [-h] &lt;ip-address&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip floating delete [-h] &lt;ip-address&gt;</computeroutput></screen>
         <para>
 Delete a floating-ip
         </para>  <variablelist wordsize="10">
@@ -3269,9 +3253,9 @@ Delete a floating-ip
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_floating_list">
+    <section xml:id="openstackclient_subcommand_ip_floating_list_with_identity_api_v2">
         <title>openstack ip floating list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip floating list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip floating list [-h]
                                   [-f {csv,html,json,json,table,value,yaml,yaml}]
                                   [-c COLUMN] [--max-width &lt;integer&gt;]
                                   [--noindent]
@@ -3290,9 +3274,9 @@ List floating-ips
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_floating_pool_list">
+    <section xml:id="openstackclient_subcommand_ip_floating_pool_list_with_identity_api_v2">
         <title>openstack ip floating pool list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip floating pool list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip floating pool list [-h]
                                        [-f {csv,html,json,json,table,value,yaml,yaml}]
                                        [-c COLUMN] [--max-width &lt;integer&gt;]
                                        [--noindent]
@@ -3311,9 +3295,9 @@ List floating-ip-pools
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ip_floating_remove">
+    <section xml:id="openstackclient_subcommand_ip_floating_remove_with_identity_api_v2">
         <title>openstack ip floating remove</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ip floating remove [-h] &lt;ip-address&gt; &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 ip floating remove [-h] &lt;ip-address&gt; &lt;server&gt;</computeroutput></screen>
         <para>
 Remove floating-ip from server
         </para>  <variablelist wordsize="10">
@@ -3347,9 +3331,9 @@ Remove floating-ip from server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_keypair_create">
+    <section xml:id="openstackclient_subcommand_keypair_create_with_identity_api_v2">
         <title>openstack keypair create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token keypair create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 keypair create [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX]
@@ -3388,9 +3372,9 @@ Create new public key
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_keypair_delete">
+    <section xml:id="openstackclient_subcommand_keypair_delete_with_identity_api_v2">
         <title>openstack keypair delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token keypair delete [-h] &lt;key&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 keypair delete [-h] &lt;key&gt;</computeroutput></screen>
         <para>
 Delete public key
         </para>  <variablelist wordsize="10">
@@ -3416,9 +3400,9 @@ Delete public key
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_keypair_list">
+    <section xml:id="openstackclient_subcommand_keypair_list_with_identity_api_v2">
         <title>openstack keypair list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token keypair list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 keypair list [-h]
                               [-f {csv,html,json,json,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
@@ -3436,9 +3420,9 @@ List public key fingerprints
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_keypair_show">
+    <section xml:id="openstackclient_subcommand_keypair_show_with_identity_api_v2">
         <title>openstack keypair show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token keypair show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 keypair show [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX] [--public-key]
@@ -3476,9 +3460,9 @@ Display public key details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_limits_show">
+    <section xml:id="openstackclient_subcommand_limits_show_with_identity_api_v2">
         <title>openstack limits show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token limits show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 limits show [-h]
                              [-f {csv,html,json,json,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--quote {all,minimal,none,nonnumeric}]
@@ -3541,9 +3525,9 @@ Show compute and volume limits
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_module_list">
+    <section xml:id="openstackclient_subcommand_module_list_with_identity_api_v2">
         <title>openstack module list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token module list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 module list [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX] [--all]</computeroutput></screen>
@@ -3569,9 +3553,9 @@ List module versions
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_network_create">
+    <section xml:id="openstackclient_subcommand_network_create_with_identity_api_v2">
         <title>openstack network create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token network create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 network create [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX]
@@ -3654,9 +3638,9 @@ Create new network
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_network_delete">
+    <section xml:id="openstackclient_subcommand_network_delete_with_identity_api_v2">
         <title>openstack network delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token network delete [-h] &lt;network&gt; [&lt;network&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 network delete [-h] &lt;network&gt; [&lt;network&gt; ...]</computeroutput></screen>
         <para>
 Delete network(s)
         </para>  <variablelist wordsize="10">
@@ -3682,9 +3666,9 @@ Delete network(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_network_list">
+    <section xml:id="openstackclient_subcommand_network_list_with_identity_api_v2">
         <title>openstack network list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token network list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 network list [-h]
                               [-f {csv,html,json,json,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--quote {all,minimal,none,nonnumeric}]
@@ -3719,9 +3703,9 @@ List networks
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_network_set">
+    <section xml:id="openstackclient_subcommand_network_set_with_identity_api_v2">
         <title>openstack network set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token network set [-h] [--name &lt;name&gt;] [--enable | --disable]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 network set [-h] [--name &lt;name&gt;] [--enable | --disable]
                              [--share | --no-share]
                              &lt;network&gt;</computeroutput></screen>
         <para>
@@ -3789,9 +3773,9 @@ Set network properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_network_show">
+    <section xml:id="openstackclient_subcommand_network_show_with_identity_api_v2">
         <title>openstack network show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token network show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 network show [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX]
@@ -3821,9 +3805,9 @@ Show network details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_object_create">
+    <section xml:id="openstackclient_subcommand_object_create_with_identity_api_v2">
         <title>openstack object create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token object create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 object create [-h]
                                [-f {csv,html,json,json,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent]
@@ -3862,9 +3846,9 @@ Upload object to container
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_object_delete">
+    <section xml:id="openstackclient_subcommand_object_delete_with_identity_api_v2">
         <title>openstack object delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token object delete [-h] &lt;container&gt; &lt;object&gt; [&lt;object&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 object delete [-h] &lt;container&gt; &lt;object&gt; [&lt;object&gt; ...]</computeroutput></screen>
         <para>
 Delete object from container
         </para>  <variablelist wordsize="10">
@@ -3898,9 +3882,9 @@ Delete object from container
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_object_list">
+    <section xml:id="openstackclient_subcommand_object_list_with_identity_api_v2">
         <title>openstack object list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token object list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 object list [-h]
                              [-f {csv,html,json,json,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--quote {all,minimal,none,nonnumeric}]
@@ -3989,9 +3973,9 @@ List objects
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_object_save">
+    <section xml:id="openstackclient_subcommand_object_save_with_identity_api_v2">
         <title>openstack object save</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token object save [-h] [--file &lt;filename&gt;] &lt;container&gt; &lt;object&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 object save [-h] [--file &lt;filename&gt;] &lt;container&gt; &lt;object&gt;</computeroutput></screen>
         <para>
 Save object locally
         </para>  <variablelist wordsize="10">
@@ -4033,9 +4017,9 @@ Save object locally
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_object_show">
+    <section xml:id="openstackclient_subcommand_object_show_with_identity_api_v2">
         <title>openstack object show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token object show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 object show [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX]
@@ -4073,9 +4057,9 @@ Display object details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_project_create">
+    <section xml:id="openstackclient_subcommand_project_create_with_identity_api_v2">
         <title>openstack project create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token project create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 project create [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX]
@@ -4149,9 +4133,9 @@ Create new project
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_project_delete">
+    <section xml:id="openstackclient_subcommand_project_delete_with_identity_api_v2">
         <title>openstack project delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token project delete [-h] &lt;project&gt; [&lt;project&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 project delete [-h] &lt;project&gt; [&lt;project&gt; ...]</computeroutput></screen>
         <para>
 Delete project(s)
         </para>  <variablelist wordsize="10">
@@ -4177,9 +4161,9 @@ Delete project(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_project_list">
+    <section xml:id="openstackclient_subcommand_project_list_with_identity_api_v2">
         <title>openstack project list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token project list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 project list [-h]
                               [-f {csv,html,json,json,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--quote {all,minimal,none,nonnumeric}] [--long]</computeroutput></screen>
@@ -4205,9 +4189,9 @@ List projects
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_project_set">
+    <section xml:id="openstackclient_subcommand_project_set_with_identity_api_v2">
         <title>openstack project set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token project set [-h] [--name &lt;name&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 project set [-h] [--name &lt;name&gt;]
                              [--description &lt;description&gt;]
                              [--enable | --disable] [--property &lt;key=value&gt;]
                              &lt;project&gt;</computeroutput></screen>
@@ -4277,9 +4261,9 @@ Set project properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_project_show">
+    <section xml:id="openstackclient_subcommand_project_show_with_identity_api_v2">
         <title>openstack project show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token project show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 project show [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX]
@@ -4309,9 +4293,9 @@ Display project details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_project_usage_list">
+    <section xml:id="openstackclient_subcommand_project_usage_list_with_identity_api_v2">
         <title>openstack project usage list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token project usage list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 project usage list [-h]
                                     [-f {csv,html,json,json,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent]
@@ -4349,391 +4333,9 @@ List resource usage per project
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_ptr_record_list">
-        <title>openstack ptr record list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ptr record list [-h]
-                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
-                                 [-c COLUMN] [--max-width &lt;integer&gt;]
-                                 [--noindent]
-                                 [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
-        <para>
-List floatingip ptr records
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_ptr_record_set">
-        <title>openstack ptr record set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ptr record set [-h]
-                                [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                [-c COLUMN] [--max-width &lt;integer&gt;]
-                                [--noindent] [--prefix PREFIX]
-                                [--description DESCRIPTION | --no-description]
-                                [--ttl TTL | --no-ttl]
-                                floatingip_id ptrdname</computeroutput></screen>
-        <para>
-Set floatingip ptr record
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>floatingip_id</command></term>
-    <listitem>
-      <para>
-        Floating IP ID
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>ptrdname</command></term>
-    <listitem>
-      <para>
-        PTRD Name
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-description</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--ttl TTL</command></term>
-    <listitem>
-      <para>
-        TTL
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-ttl</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_ptr_record_show">
-        <title>openstack ptr record show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ptr record show [-h]
-                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                 [-c COLUMN] [--max-width &lt;integer&gt;]
-                                 [--noindent] [--prefix PREFIX]
-                                 floatingip_id</computeroutput></screen>
-        <para>
-Show floatingip ptr record details
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>floatingip_id</command></term>
-    <listitem>
-      <para>
-        Floating IP ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_ptr_record_unset">
-        <title>openstack ptr record unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token ptr record unset [-h] floatingip_id</computeroutput></screen>
-        <para>
-Unset floatingip ptr record
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>floatingip_id</command></term>
-    <listitem>
-      <para>
-        Floating IP ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_create">
-        <title>openstack queue create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue create [-h]
-                              [-f {html,json,json,shell,table,value,yaml,yaml}]
-                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                              [--prefix PREFIX]
-                              &lt;queue_name&gt;</computeroutput></screen>
-        <para>
-Create a queue.
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>&lt;queue_name&gt;</command></term>
-    <listitem>
-      <para>
-        Name of the queue
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_delete">
-        <title>openstack queue delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue delete [-h] &lt;queue_name&gt;</computeroutput></screen>
-        <para>
-Delete a queue.
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>&lt;queue_name&gt;</command></term>
-    <listitem>
-      <para>
-        Name of the queue
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_exists">
-        <title>openstack queue exists</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue exists [-h]
-                              [-f {html,json,json,shell,table,value,yaml,yaml}]
-                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                              [--prefix PREFIX]
-                              &lt;queue_name&gt;</computeroutput></screen>
-        <para>
-Check queue existence.
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>&lt;queue_name&gt;</command></term>
-    <listitem>
-      <para>
-        Name of the queue
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_get_metadata">
-        <title>openstack queue get metadata</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue get metadata [-h]
-                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                    [-c COLUMN] [--max-width &lt;integer&gt;]
-                                    [--noindent] [--prefix PREFIX]
-                                    &lt;queue_name&gt;</computeroutput></screen>
-        <para>
-Get queue metadata.
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>&lt;queue_name&gt;</command></term>
-    <listitem>
-      <para>
-        Name of the queue
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_list">
-        <title>openstack queue list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue list [-h]
-                            [-f {csv,html,json,json,table,value,yaml,yaml}]
-                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                            [--quote {all,minimal,none,nonnumeric}]
-                            [--marker &lt;queue_id&gt;] [--limit &lt;limit&gt;]</computeroutput></screen>
-        <para>
-List available queues.
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--marker &lt;queue_id&gt;</command></term>
-    <listitem>
-      <para>
-        Queue's paging marker
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--limit &lt;limit&gt;</command></term>
-    <listitem>
-      <para>
-        Page size limit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_set_metadata">
-        <title>openstack queue set metadata</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue set metadata [-h] &lt;queue_name&gt; &lt;queue_metadata&gt;</computeroutput></screen>
-        <para>
-Set queue metadata.
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>&lt;queue_name&gt;</command></term>
-    <listitem>
-      <para>
-        Name of the queue
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>&lt;queue_metadata&gt;</command></term>
-    <listitem>
-      <para>
-        Queue metadata
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_queue_stats">
-        <title>openstack queue stats</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token queue stats [-h]
-                             [-f {html,json,json,shell,table,value,yaml,yaml}]
-                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                             [--prefix PREFIX]
-                             &lt;queue_name&gt;</computeroutput></screen>
-        <para>
-Get queue stats.
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>&lt;queue_name&gt;</command></term>
-    <listitem>
-      <para>
-        Name of the queue
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_quota_set">
+    <section xml:id="openstackclient_subcommand_quota_set_with_identity_api_v2">
         <title>openstack quota set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token quota set [-h] [--class] [--properties &lt;properties&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 quota set [-h] [--class] [--properties &lt;properties&gt;]
                            [--ram &lt;ram&gt;] [--secgroup-rules &lt;secgroup-rules&gt;]
                            [--instances &lt;instances&gt;] [--key-pairs &lt;key-pairs&gt;]
                            [--fixed-ips &lt;fixed-ips&gt;] [--secgroups &lt;secgroups&gt;]
@@ -4907,9 +4509,9 @@ Set quotas for project or class
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_quota_show">
+    <section xml:id="openstackclient_subcommand_quota_show_with_identity_api_v2">
         <title>openstack quota show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token quota show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 quota show [-h]
                             [-f {html,json,json,shell,table,value,yaml,yaml}]
                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                             [--prefix PREFIX] [--class | --default]
@@ -4955,281 +4557,9 @@ Show quotas for project or class
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_recordset_create">
-        <title>openstack recordset create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token recordset create [-h]
-                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                  [-c COLUMN] [--max-width &lt;integer&gt;]
-                                  [--noindent] [--prefix PREFIX] --records
-                                  RECORDS [RECORDS ...] --type TYPE
-                                  [--ttl TTL] [--description DESCRIPTION]
-                                  zone_id name</computeroutput></screen>
-        <para>
-Create new recordset
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>zone_id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>name</command></term>
-    <listitem>
-      <para>
-        RecordSet Name
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--records RECORDS [RECORDS ...]</command></term>
-    <listitem>
-      <para>
-      RecordSet Records
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--type TYPE</command></term>
-    <listitem>
-      <para>
-        RecordSet Type
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--ttl TTL</command></term>
-    <listitem>
-      <para>
-        Time To Live (Seconds)
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_recordset_delete">
-        <title>openstack recordset delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token recordset delete [-h] zone_id id</computeroutput></screen>
-        <para>
-Delete recordset
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>zone_id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        RecordSet ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_recordset_list">
-        <title>openstack recordset list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token recordset list [-h]
-                                [-f {csv,html,json,json,table,value,yaml,yaml}]
-                                [-c COLUMN] [--max-width &lt;integer&gt;]
-                                [--noindent]
-                                [--quote {all,minimal,none,nonnumeric}]
-                                zone_id</computeroutput></screen>
-        <para>
-List recordsets
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>zone_id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_recordset_set">
-        <title>openstack recordset set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token recordset set [-h]
-                               [-f {html,json,json,shell,table,value,yaml,yaml}]
-                               [-c COLUMN] [--max-width &lt;integer&gt;]
-                               [--noindent] [--prefix PREFIX] [--name NAME]
-                               [--records RECORDS [RECORDS ...]]
-                               [--description DESCRIPTION | --no-description]
-                               [--ttl TTL | --no-ttl]
-                               zone_id id</computeroutput></screen>
-        <para>
-Set recordset properties
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>zone_id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        RecordSet ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--name NAME</command></term>
-    <listitem>
-      <para>
-        RecordSet Name
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--records RECORDS [RECORDS ...]</command></term>
-    <listitem>
-      <para>
-      Records
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-description</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--ttl TTL</command></term>
-    <listitem>
-      <para>
-        TTL
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-ttl</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_recordset_show">
-        <title>openstack recordset show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token recordset show [-h]
-                                [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                [-c COLUMN] [--max-width &lt;integer&gt;]
-                                [--noindent] [--prefix PREFIX]
-                                zone_id id</computeroutput></screen>
-        <para>
-Show recordset details
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>zone_id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        RecordSet ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_role_add">
+    <section xml:id="openstackclient_subcommand_role_add_with_identity_api_v2">
         <title>openstack role add</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token role add [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 role add [-h]
                           [-f {html,json,json,shell,table,value,yaml,yaml}]
                           [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                           [--prefix PREFIX] --project &lt;project&gt; --user &lt;user&gt;
@@ -5275,9 +4605,9 @@ Add role to project:user
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_role_create">
+    <section xml:id="openstackclient_subcommand_role_create_with_identity_api_v2">
         <title>openstack role create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token role create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 role create [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX] [--or-show]
@@ -5315,9 +4645,9 @@ Create new role
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_role_delete">
+    <section xml:id="openstackclient_subcommand_role_delete_with_identity_api_v2">
         <title>openstack role delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token role delete [-h] &lt;role&gt; [&lt;role&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 role delete [-h] &lt;role&gt; [&lt;role&gt; ...]</computeroutput></screen>
         <para>
 Delete role(s)
         </para>  <variablelist wordsize="10">
@@ -5343,9 +4673,9 @@ Delete role(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_role_list">
+    <section xml:id="openstackclient_subcommand_role_list_with_identity_api_v2">
         <title>openstack role list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token role list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 role list [-h]
                            [-f {csv,html,json,json,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--quote {all,minimal,none,nonnumeric}]
@@ -5380,9 +4710,9 @@ List roles
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_role_remove">
+    <section xml:id="openstackclient_subcommand_role_remove_with_identity_api_v2">
         <title>openstack role remove</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token role remove [-h] --project &lt;project&gt; --user &lt;user&gt; &lt;role&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 role remove [-h] --project &lt;project&gt; --user &lt;user&gt; &lt;role&gt;</computeroutput></screen>
         <para>
 Remove role from project : user
         </para>  <variablelist wordsize="10">
@@ -5424,9 +4754,9 @@ Remove role from project : user
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_role_show">
+    <section xml:id="openstackclient_subcommand_role_show_with_identity_api_v2">
         <title>openstack role show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token role show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 role show [-h]
                            [-f {html,json,json,shell,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--prefix PREFIX]
@@ -5456,9 +4786,9 @@ Display role details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_create">
+    <section xml:id="openstackclient_subcommand_security_group_create_with_identity_api_v2">
         <title>openstack security group create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group create [-h]
                                        [-f {html,json,json,shell,table,value,yaml,yaml}]
                                        [-c COLUMN] [--max-width &lt;integer&gt;]
                                        [--noindent] [--prefix PREFIX]
@@ -5497,9 +4827,9 @@ Create a new security group
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_delete">
+    <section xml:id="openstackclient_subcommand_security_group_delete_with_identity_api_v2">
         <title>openstack security group delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group delete [-h] &lt;group&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group delete [-h] &lt;group&gt;</computeroutput></screen>
         <para>
 Delete a security group
         </para>  <variablelist wordsize="10">
@@ -5525,9 +4855,9 @@ Delete a security group
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_list">
+    <section xml:id="openstackclient_subcommand_security_group_list_with_identity_api_v2">
         <title>openstack security group list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group list [-h]
                                      [-f {csv,html,json,json,table,value,yaml,yaml}]
                                      [-c COLUMN] [--max-width &lt;integer&gt;]
                                      [--noindent]
@@ -5555,9 +4885,9 @@ List all security groups
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_rule_create">
+    <section xml:id="openstackclient_subcommand_security_group_rule_create_with_identity_api_v2">
         <title>openstack security group rule create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group rule create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group rule create [-h]
                                             [-f {html,json,json,shell,table,value,yaml,yaml}]
                                             [-c COLUMN]
                                             [--max-width &lt;integer&gt;]
@@ -5616,9 +4946,9 @@ Create a new security group rule
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_rule_delete">
+    <section xml:id="openstackclient_subcommand_security_group_rule_delete_with_identity_api_v2">
         <title>openstack security group rule delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group rule delete [-h] &lt;rule&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group rule delete [-h] &lt;rule&gt;</computeroutput></screen>
         <para>
 Delete a security group rule
         </para>  <variablelist wordsize="10">
@@ -5644,9 +4974,9 @@ Delete a security group rule
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_rule_list">
+    <section xml:id="openstackclient_subcommand_security_group_rule_list_with_identity_api_v2">
         <title>openstack security group rule list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group rule list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group rule list [-h]
                                           [-f {csv,html,json,json,table,value,yaml,yaml}]
                                           [-c COLUMN] [--max-width &lt;integer&gt;]
                                           [--noindent]
@@ -5677,9 +5007,9 @@ List all security group rules
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_set">
+    <section xml:id="openstackclient_subcommand_security_group_set_with_identity_api_v2">
         <title>openstack security group set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group set [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group set [-h]
                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent] [--prefix PREFIX]
@@ -5727,9 +5057,9 @@ Set security group properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_security_group_show">
+    <section xml:id="openstackclient_subcommand_security_group_show_with_identity_api_v2">
         <title>openstack security group show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token security group show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 security group show [-h]
                                      [-f {html,json,json,shell,table,value,yaml,yaml}]
                                      [-c COLUMN] [--max-width &lt;integer&gt;]
                                      [--noindent] [--prefix PREFIX]
@@ -5759,9 +5089,9 @@ Show a specific security group
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_add_security_group">
+    <section xml:id="openstackclient_subcommand_server_add_security_group_with_identity_api_v2">
         <title>openstack server add security group</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server add security group [-h] &lt;server&gt; &lt;group&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server add security group [-h] &lt;server&gt; &lt;group&gt;</computeroutput></screen>
         <para>
 Add security group to server
         </para>  <variablelist wordsize="10">
@@ -5795,9 +5125,9 @@ Add security group to server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_add_volume">
+    <section xml:id="openstackclient_subcommand_server_add_volume_with_identity_api_v2">
         <title>openstack server add volume</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server add volume [-h] [--device &lt;device&gt;] &lt;server&gt; &lt;volume&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server add volume [-h] [--device &lt;device&gt;] &lt;server&gt; &lt;volume&gt;</computeroutput></screen>
         <para>
 Add volume to server
         </para>  <variablelist wordsize="10">
@@ -5839,9 +5169,9 @@ Add volume to server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_create">
+    <section xml:id="openstackclient_subcommand_server_create_with_identity_api_v2">
         <title>openstack server create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server create [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX]
@@ -6025,9 +5355,9 @@ Create a new server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_delete">
+    <section xml:id="openstackclient_subcommand_server_delete_with_identity_api_v2">
         <title>openstack server delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server delete [-h] [--wait] &lt;server&gt; [&lt;server&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server delete [-h] [--wait] &lt;server&gt; [&lt;server&gt; ...]</computeroutput></screen>
         <para>
 Delete server(s)
         </para>  <variablelist wordsize="10">
@@ -6061,9 +5391,9 @@ Delete server(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_image_create">
+    <section xml:id="openstackclient_subcommand_server_image_create_with_identity_api_v2">
         <title>openstack server image create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server image create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server image create [-h]
                                      [-f {html,json,json,shell,table,value,yaml,yaml}]
                                      [-c COLUMN] [--max-width &lt;integer&gt;]
                                      [--noindent] [--prefix PREFIX]
@@ -6110,9 +5440,9 @@ Create a new disk image from a running server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_list">
+    <section xml:id="openstackclient_subcommand_server_list_with_identity_api_v2">
         <title>openstack server list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server list [-h]
                              [-f {csv,html,json,json,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--quote {all,minimal,none,nonnumeric}]
@@ -6263,9 +5593,9 @@ List servers
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_lock">
+    <section xml:id="openstackclient_subcommand_server_lock_with_identity_api_v2">
         <title>openstack server lock</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server lock [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server lock [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Lock a server. A non-admin user will not be able to execute actions
         </para>  <variablelist wordsize="10">
@@ -6291,9 +5621,9 @@ Lock a server. A non-admin user will not be able to execute actions
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_migrate">
+    <section xml:id="openstackclient_subcommand_server_migrate_with_identity_api_v2">
         <title>openstack server migrate</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server migrate [-h] [--live &lt;hostname&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server migrate [-h] [--live &lt;hostname&gt;]
                                 [--shared-migration | --block-migration]
                                 [--disk-overcommit | --no-disk-overcommit]
                                 [--wait]
@@ -6372,9 +5702,9 @@ Migrate server to different host
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_pause">
+    <section xml:id="openstackclient_subcommand_server_pause_with_identity_api_v2">
         <title>openstack server pause</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server pause [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server pause [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Pause server
         </para>  <variablelist wordsize="10">
@@ -6400,9 +5730,9 @@ Pause server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_reboot">
+    <section xml:id="openstackclient_subcommand_server_reboot_with_identity_api_v2">
         <title>openstack server reboot</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server reboot [-h] [--hard | --soft] [--wait] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server reboot [-h] [--hard | --soft] [--wait] &lt;server&gt;</computeroutput></screen>
         <para>
 Perform a hard or soft server reboot
         </para>  <variablelist wordsize="10">
@@ -6452,9 +5782,9 @@ Perform a hard or soft server reboot
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_rebuild">
+    <section xml:id="openstackclient_subcommand_server_rebuild_with_identity_api_v2">
         <title>openstack server rebuild</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server rebuild [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server rebuild [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX] --image &lt;image&gt;
@@ -6509,9 +5839,9 @@ Rebuild server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_remove_security_group">
+    <section xml:id="openstackclient_subcommand_server_remove_security_group_with_identity_api_v2">
         <title>openstack server remove security group</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server remove security group [-h] &lt;server&gt; &lt;group&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server remove security group [-h] &lt;server&gt; &lt;group&gt;</computeroutput></screen>
         <para>
 Remove security group from server
         </para>  <variablelist wordsize="10">
@@ -6545,9 +5875,9 @@ Remove security group from server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_remove_volume">
+    <section xml:id="openstackclient_subcommand_server_remove_volume_with_identity_api_v2">
         <title>openstack server remove volume</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server remove volume [-h] &lt;server&gt; &lt;volume&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server remove volume [-h] &lt;server&gt; &lt;volume&gt;</computeroutput></screen>
         <para>
 Remove volume from server
         </para>  <variablelist wordsize="10">
@@ -6581,9 +5911,9 @@ Remove volume from server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_rescue">
+    <section xml:id="openstackclient_subcommand_server_rescue_with_identity_api_v2">
         <title>openstack server rescue</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server rescue [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server rescue [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX]
@@ -6613,9 +5943,9 @@ Put server in rescue mode
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_resize">
+    <section xml:id="openstackclient_subcommand_server_resize_with_identity_api_v2">
         <title>openstack server resize</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server resize [-h] [--flavor &lt;flavor&gt; | --confirm | --revert]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server resize [-h] [--flavor &lt;flavor&gt; | --confirm | --revert]
                                [--wait]
                                &lt;server&gt;</computeroutput></screen>
         <para>
@@ -6675,9 +6005,9 @@ Scale server to a new flavor
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_resume">
+    <section xml:id="openstackclient_subcommand_server_resume_with_identity_api_v2">
         <title>openstack server resume</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server resume [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server resume [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Resume server
         </para>  <variablelist wordsize="10">
@@ -6703,9 +6033,9 @@ Resume server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_set">
+    <section xml:id="openstackclient_subcommand_server_set_with_identity_api_v2">
         <title>openstack server set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server set [-h] [--name &lt;new-name&gt;] [--root-password]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server set [-h] [--name &lt;new-name&gt;] [--root-password]
                             [--property &lt;key=value&gt;]
                             &lt;server&gt;</computeroutput></screen>
         <para>
@@ -6758,9 +6088,9 @@ Set server properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_show">
+    <section xml:id="openstackclient_subcommand_server_show_with_identity_api_v2">
         <title>openstack server show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server show [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX] [--diagnostics]
@@ -6798,9 +6128,9 @@ Show server details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_ssh">
+    <section xml:id="openstackclient_subcommand_server_ssh_with_identity_api_v2">
         <title>openstack server ssh</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server ssh [-h] [--login &lt;login-name&gt;] [--port &lt;port&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server ssh [-h] [--login &lt;login-name&gt;] [--port &lt;port&gt;]
                             [--identity &lt;keyfile&gt;] [--option &lt;config-options&gt;]
                             [-4 | -6]
                             [--public | --private | --address-type &lt;address-type&gt;]
@@ -6902,9 +6232,9 @@ Ssh to server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_suspend">
+    <section xml:id="openstackclient_subcommand_server_suspend_with_identity_api_v2">
         <title>openstack server suspend</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server suspend [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server suspend [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Suspend server
         </para>  <variablelist wordsize="10">
@@ -6930,9 +6260,9 @@ Suspend server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_unlock">
+    <section xml:id="openstackclient_subcommand_server_unlock_with_identity_api_v2">
         <title>openstack server unlock</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server unlock [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server unlock [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Unlock server
         </para>  <variablelist wordsize="10">
@@ -6958,9 +6288,9 @@ Unlock server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_unpause">
+    <section xml:id="openstackclient_subcommand_server_unpause_with_identity_api_v2">
         <title>openstack server unpause</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server unpause [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server unpause [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Unpause server
         </para>  <variablelist wordsize="10">
@@ -6986,9 +6316,9 @@ Unpause server
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_unrescue">
+    <section xml:id="openstackclient_subcommand_server_unrescue_with_identity_api_v2">
         <title>openstack server unrescue</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server unrescue [-h] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server unrescue [-h] &lt;server&gt;</computeroutput></screen>
         <para>
 Restore server from rescue mode
         </para>  <variablelist wordsize="10">
@@ -7014,9 +6344,9 @@ Restore server from rescue mode
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_server_unset">
+    <section xml:id="openstackclient_subcommand_server_unset_with_identity_api_v2">
         <title>openstack server unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token server unset [-h] [--property &lt;key&gt;] &lt;server&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 server unset [-h] [--property &lt;key&gt;] &lt;server&gt;</computeroutput></screen>
         <para>
 Unset server properties
         </para>  <variablelist wordsize="10">
@@ -7051,9 +6381,9 @@ Unset server properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_service_create">
+    <section xml:id="openstackclient_subcommand_service_create_with_identity_api_v2">
         <title>openstack service create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token service create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 service create [-h]
                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent] [--prefix PREFIX] [--name &lt;name&gt;]
@@ -7101,9 +6431,9 @@ Create new service
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_service_delete">
+    <section xml:id="openstackclient_subcommand_service_delete_with_identity_api_v2">
         <title>openstack service delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token service delete [-h] &lt;service&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 service delete [-h] &lt;service&gt;</computeroutput></screen>
         <para>
 Delete service
         </para>  <variablelist wordsize="10">
@@ -7129,9 +6459,9 @@ Delete service
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_service_list">
+    <section xml:id="openstackclient_subcommand_service_list_with_identity_api_v2">
         <title>openstack service list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token service list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 service list [-h]
                               [-f {csv,html,json,json,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--quote {all,minimal,none,nonnumeric}] [--long]</computeroutput></screen>
@@ -7157,9 +6487,9 @@ List services
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_service_show">
+    <section xml:id="openstackclient_subcommand_service_show_with_identity_api_v2">
         <title>openstack service show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token service show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 service show [-h]
                               [-f {html,json,json,shell,table,value,yaml,yaml}]
                               [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                               [--prefix PREFIX] [--catalog]
@@ -7197,9 +6527,9 @@ Display service details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_snapshot_create">
+    <section xml:id="openstackclient_subcommand_snapshot_create_with_identity_api_v2">
         <title>openstack snapshot create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token snapshot create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 snapshot create [-h]
                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
                                  [-c COLUMN] [--max-width &lt;integer&gt;]
                                  [--noindent] [--prefix PREFIX] --name &lt;name&gt;
@@ -7255,9 +6585,9 @@ Create new snapshot
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_snapshot_delete">
+    <section xml:id="openstackclient_subcommand_snapshot_delete_with_identity_api_v2">
         <title>openstack snapshot delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token snapshot delete [-h] &lt;snapshot&gt; [&lt;snapshot&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 snapshot delete [-h] &lt;snapshot&gt; [&lt;snapshot&gt; ...]</computeroutput></screen>
         <para>
 Delete snapshot(s)
         </para>  <variablelist wordsize="10">
@@ -7283,9 +6613,9 @@ Delete snapshot(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_snapshot_list">
+    <section xml:id="openstackclient_subcommand_snapshot_list_with_identity_api_v2">
         <title>openstack snapshot list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token snapshot list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 snapshot list [-h]
                                [-f {csv,html,json,json,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent]
@@ -7313,9 +6643,9 @@ List snapshots
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_snapshot_set">
+    <section xml:id="openstackclient_subcommand_snapshot_set_with_identity_api_v2">
         <title>openstack snapshot set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token snapshot set [-h] [--name &lt;name&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 snapshot set [-h] [--name &lt;name&gt;]
                               [--description &lt;description&gt;]
                               [--property &lt;key=value&gt;]
                               &lt;snapshot&gt;</computeroutput></screen>
@@ -7369,9 +6699,9 @@ Set snapshot properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_snapshot_show">
+    <section xml:id="openstackclient_subcommand_snapshot_show_with_identity_api_v2">
         <title>openstack snapshot show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token snapshot show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 snapshot show [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX]
@@ -7401,9 +6731,9 @@ Display snapshot details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_snapshot_unset">
+    <section xml:id="openstackclient_subcommand_snapshot_unset_with_identity_api_v2">
         <title>openstack snapshot unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token snapshot unset [-h] --property &lt;key&gt; &lt;snapshot&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 snapshot unset [-h] --property &lt;key&gt; &lt;snapshot&gt;</computeroutput></screen>
         <para>
 Unset snapshot properties
         </para>  <variablelist wordsize="10">
@@ -7438,181 +6768,9 @@ Unset snapshot properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_tld_create">
-        <title>openstack tld create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token tld create [-h]
-                            [-f {html,json,json,shell,table,value,yaml,yaml}]
-                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                            [--prefix PREFIX] --name NAME
-                            [--description DESCRIPTION]</computeroutput></screen>
-        <para>
-Create new tld
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--name NAME</command></term>
-    <listitem>
-      <para>
-        TLD Name
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_tld_delete">
-        <title>openstack tld delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token tld delete [-h] id</computeroutput></screen>
-        <para>
-Delete tld
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        TLD ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_tld_list">
-        <title>openstack tld list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token tld list [-h] [-f {csv,html,json,json,table,value,yaml,yaml}]
-                          [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                          [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
-        <para>
-List tlds
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_tld_set">
-        <title>openstack tld set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token tld set [-h]
-                         [-f {html,json,json,shell,table,value,yaml,yaml}]
-                         [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                         [--prefix PREFIX] [--name NAME]
-                         [--description DESCRIPTION | --no-description]
-                         id</computeroutput></screen>
-        <para>
-Set tld properties
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        TLD ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--name NAME</command></term>
-    <listitem>
-      <para>
-        TLD Name
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-description</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_tld_show">
-        <title>openstack tld show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token tld show [-h]
-                          [-f {html,json,json,shell,table,value,yaml,yaml}]
-                          [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                          [--prefix PREFIX]
-                          id</computeroutput></screen>
-        <para>
-Show tld details
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        TLD ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_token_issue">
+    <section xml:id="openstackclient_subcommand_token_issue_with_identity_api_v2">
         <title>openstack token issue</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token token issue [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 token issue [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX]</computeroutput></screen>
@@ -7630,9 +6788,9 @@ Issue new token
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_token_revoke">
+    <section xml:id="openstackclient_subcommand_token_revoke_with_identity_api_v2">
         <title>openstack token revoke</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token token revoke [-h] &lt;token&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 token revoke [-h] &lt;token&gt;</computeroutput></screen>
         <para>
 Revoke existing token
         </para>  <variablelist wordsize="10">
@@ -7658,9 +6816,9 @@ Revoke existing token
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_usage_list">
+    <section xml:id="openstackclient_subcommand_usage_list_with_identity_api_v2">
         <title>openstack usage list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token usage list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 usage list [-h]
                             [-f {csv,html,json,json,table,value,yaml,yaml}]
                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                             [--quote {all,minimal,none,nonnumeric}]
@@ -7697,9 +6855,9 @@ List resource usage per project
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_usage_show">
+    <section xml:id="openstackclient_subcommand_usage_show_with_identity_api_v2">
         <title>openstack usage show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token usage show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 usage show [-h]
                             [-f {html,json,json,shell,table,value,yaml,yaml}]
                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                             [--prefix PREFIX] [--project &lt;project&gt;]
@@ -7744,9 +6902,9 @@ Show resource usage for a single project
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_user_create">
+    <section xml:id="openstackclient_subcommand_user_create_with_identity_api_v2">
         <title>openstack user create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token user create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 user create [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX] [--project &lt;project&gt;]
@@ -7835,9 +6993,9 @@ Create new user
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_user_delete">
+    <section xml:id="openstackclient_subcommand_user_delete_with_identity_api_v2">
         <title>openstack user delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token user delete [-h] &lt;user&gt; [&lt;user&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 user delete [-h] &lt;user&gt; [&lt;user&gt; ...]</computeroutput></screen>
         <para>
 Delete user(s)
         </para>  <variablelist wordsize="10">
@@ -7863,9 +7021,9 @@ Delete user(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_user_list">
+    <section xml:id="openstackclient_subcommand_user_list_with_identity_api_v2">
         <title>openstack user list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token user list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 user list [-h]
                            [-f {csv,html,json,json,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--quote {all,minimal,none,nonnumeric}]
@@ -7900,9 +7058,9 @@ List users
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_user_role_list">
+    <section xml:id="openstackclient_subcommand_user_role_list_with_identity_api_v2">
         <title>openstack user role list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token user role list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 user role list [-h]
                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
                                 [-c COLUMN] [--max-width &lt;integer&gt;]
                                 [--noindent]
@@ -7942,9 +7100,9 @@ List user-role assignments
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_user_set">
+    <section xml:id="openstackclient_subcommand_user_set_with_identity_api_v2">
         <title>openstack user set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token user set [-h] [--name &lt;name&gt;] [--project &lt;project&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 user set [-h] [--name &lt;name&gt;] [--project &lt;project&gt;]
                           [--password &lt;user-password&gt;] [--password-prompt]
                           [--email &lt;email-address&gt;] [--enable | --disable]
                           &lt;user&gt;</computeroutput></screen>
@@ -8029,9 +7187,9 @@ Set user properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_user_show">
+    <section xml:id="openstackclient_subcommand_user_show_with_identity_api_v2">
         <title>openstack user show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token user show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 user show [-h]
                            [-f {html,json,json,shell,table,value,yaml,yaml}]
                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                            [--prefix PREFIX]
@@ -8061,9 +7219,9 @@ Display user details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_create">
+    <section xml:id="openstackclient_subcommand_volume_create_with_identity_api_v2">
         <title>openstack volume create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume create [-h]
                                [-f {html,json,json,shell,table,value,yaml,yaml}]
                                [-c COLUMN] [--max-width &lt;integer&gt;]
                                [--noindent] [--prefix PREFIX] --size &lt;size&gt;
@@ -8181,9 +7339,9 @@ Create new volume
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_delete">
+    <section xml:id="openstackclient_subcommand_volume_delete_with_identity_api_v2">
         <title>openstack volume delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume delete [-h] [--force] &lt;volume&gt; [&lt;volume&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume delete [-h] [--force] &lt;volume&gt; [&lt;volume&gt; ...]</computeroutput></screen>
         <para>
 Delete volume(s)
         </para>  <variablelist wordsize="10">
@@ -8218,9 +7376,9 @@ Delete volume(s)
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_list">
+    <section xml:id="openstackclient_subcommand_volume_list_with_identity_api_v2">
         <title>openstack volume list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume list [-h]
                              [-f {csv,html,json,json,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--quote {all,minimal,none,nonnumeric}]
@@ -8272,9 +7430,9 @@ List volumes
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_associate">
+    <section xml:id="openstackclient_subcommand_volume_qos_associate_with_identity_api_v2">
         <title>openstack volume qos associate</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos associate [-h] &lt;qos-spec&gt; &lt;volume-type&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos associate [-h] &lt;qos-spec&gt; &lt;volume-type&gt;</computeroutput></screen>
         <para>
 Associate a QoS specification to a volume type
         </para>  <variablelist wordsize="10">
@@ -8308,9 +7466,9 @@ Associate a QoS specification to a volume type
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_create">
+    <section xml:id="openstackclient_subcommand_volume_qos_create_with_identity_api_v2">
         <title>openstack volume qos create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos create [-h]
                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
                                    [-c COLUMN] [--max-width &lt;integer&gt;]
                                    [--noindent] [--prefix PREFIX]
@@ -8360,9 +7518,9 @@ Create new QoS specification
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_delete">
+    <section xml:id="openstackclient_subcommand_volume_qos_delete_with_identity_api_v2">
         <title>openstack volume qos delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos delete [-h] &lt;qos-spec&gt; [&lt;qos-spec&gt; ...]</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos delete [-h] &lt;qos-spec&gt; [&lt;qos-spec&gt; ...]</computeroutput></screen>
         <para>
 Delete QoS specification
         </para>  <variablelist wordsize="10">
@@ -8388,9 +7546,9 @@ Delete QoS specification
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_disassociate">
+    <section xml:id="openstackclient_subcommand_volume_qos_disassociate_with_identity_api_v2">
         <title>openstack volume qos disassociate</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos disassociate [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos disassociate [-h]
                                          [--volume-type &lt;volume-type&gt; | --all]
                                          &lt;qos-spec&gt;</computeroutput></screen>
         <para>
@@ -8434,9 +7592,9 @@ Disassociate a QoS specification from a volume type
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_list">
+    <section xml:id="openstackclient_subcommand_volume_qos_list_with_identity_api_v2">
         <title>openstack volume qos list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos list [-h]
                                  [-f {csv,html,json,json,table,value,yaml,yaml}]
                                  [-c COLUMN] [--max-width &lt;integer&gt;]
                                  [--noindent]
@@ -8455,9 +7613,9 @@ List QoS specifications
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_set">
+    <section xml:id="openstackclient_subcommand_volume_qos_set_with_identity_api_v2">
         <title>openstack volume qos set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos set [-h] [--property &lt;key=value&gt;] &lt;qos-spec&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos set [-h] [--property &lt;key=value&gt;] &lt;qos-spec&gt;</computeroutput></screen>
         <para>
 Set QoS specification properties
         </para>  <variablelist wordsize="10">
@@ -8492,9 +7650,9 @@ Set QoS specification properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_show">
+    <section xml:id="openstackclient_subcommand_volume_qos_show_with_identity_api_v2">
         <title>openstack volume qos show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos show [-h]
                                  [-f {html,json,json,shell,table,value,yaml,yaml}]
                                  [-c COLUMN] [--max-width &lt;integer&gt;]
                                  [--noindent] [--prefix PREFIX]
@@ -8524,9 +7682,9 @@ Display QoS specification details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_qos_unset">
+    <section xml:id="openstackclient_subcommand_volume_qos_unset_with_identity_api_v2">
         <title>openstack volume qos unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume qos unset [-h] [--property &lt;key&gt;] &lt;qos-spec&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume qos unset [-h] [--property &lt;key&gt;] &lt;qos-spec&gt;</computeroutput></screen>
         <para>
 Unset QoS specification properties
         </para>  <variablelist wordsize="10">
@@ -8561,9 +7719,9 @@ Unset QoS specification properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_set">
+    <section xml:id="openstackclient_subcommand_volume_set_with_identity_api_v2">
         <title>openstack volume set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume set [-h] [--name &lt;name&gt;] [--description &lt;description&gt;]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume set [-h] [--name &lt;name&gt;] [--description &lt;description&gt;]
                             [--size &lt;size&gt;] [--property &lt;key=value&gt;]
                             &lt;volume&gt;</computeroutput></screen>
         <para>
@@ -8624,9 +7782,9 @@ Set volume properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_show">
+    <section xml:id="openstackclient_subcommand_volume_show_with_identity_api_v2">
         <title>openstack volume show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume show [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
                              [--prefix PREFIX]
@@ -8656,9 +7814,9 @@ Show volume details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_type_create">
+    <section xml:id="openstackclient_subcommand_volume_type_create_with_identity_api_v2">
         <title>openstack volume type create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume type create [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume type create [-h]
                                     [-f {html,json,json,shell,table,value,yaml,yaml}]
                                     [-c COLUMN] [--max-width &lt;integer&gt;]
                                     [--noindent] [--prefix PREFIX]
@@ -8698,9 +7856,9 @@ Create new volume type
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_type_delete">
+    <section xml:id="openstackclient_subcommand_volume_type_delete_with_identity_api_v2">
         <title>openstack volume type delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume type delete [-h] &lt;volume-type&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume type delete [-h] &lt;volume-type&gt;</computeroutput></screen>
         <para>
 Delete volume type
         </para>  <variablelist wordsize="10">
@@ -8726,9 +7884,9 @@ Delete volume type
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_type_list">
+    <section xml:id="openstackclient_subcommand_volume_type_list_with_identity_api_v2">
         <title>openstack volume type list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume type list [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume type list [-h]
                                   [-f {csv,html,json,json,table,value,yaml,yaml}]
                                   [-c COLUMN] [--max-width &lt;integer&gt;]
                                   [--noindent]
@@ -8756,9 +7914,9 @@ List volume types
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_type_set">
+    <section xml:id="openstackclient_subcommand_volume_type_set_with_identity_api_v2">
         <title>openstack volume type set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume type set [-h] [--property &lt;key=value&gt;] &lt;volume-type&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume type set [-h] [--property &lt;key=value&gt;] &lt;volume-type&gt;</computeroutput></screen>
         <para>
 Set volume type properties
         </para>  <variablelist wordsize="10">
@@ -8793,9 +7951,9 @@ Set volume type properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_type_show">
+    <section xml:id="openstackclient_subcommand_volume_type_show_with_identity_api_v2">
         <title>openstack volume type show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume type show [-h]
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume type show [-h]
                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
                                   [-c COLUMN] [--max-width &lt;integer&gt;]
                                   [--noindent] [--prefix PREFIX]
@@ -8825,9 +7983,9 @@ Display volume type details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_type_unset">
+    <section xml:id="openstackclient_subcommand_volume_type_unset_with_identity_api_v2">
         <title>openstack volume type unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume type unset [-h] --property &lt;key&gt; &lt;volume-type&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume type unset [-h] --property &lt;key&gt; &lt;volume-type&gt;</computeroutput></screen>
         <para>
 Unset volume type properties
         </para>  <variablelist wordsize="10">
@@ -8862,9 +8020,9 @@ Unset volume type properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_volume_unset">
+    <section xml:id="openstackclient_subcommand_volume_unset_with_identity_api_v2">
         <title>openstack volume unset</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token volume unset [-h] --property &lt;key&gt; &lt;volume&gt;</computeroutput></screen>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 2 volume unset [-h] --property &lt;key&gt; &lt;volume&gt;</computeroutput></screen>
         <para>
 Unset volume properties
         </para>  <variablelist wordsize="10">
@@ -8899,222 +8057,126 @@ Unset volume properties
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_zone_abandon">
-        <title>openstack zone abandon</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone abandon [-h] id</computeroutput></screen>
-        <para>
-Abandon a zone
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
+
     </section>
-    <section xml:id="openstackclient_subcommand_zone_axfr">
-        <title>openstack zone axfr</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone axfr [-h] id</computeroutput></screen>
-        <para>
-AXFR a zone
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_blacklist_create">
-        <title>openstack zone blacklist create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone blacklist create [-h]
-                                       [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                       [-c COLUMN] [--max-width &lt;integer&gt;]
-                                       [--noindent] [--prefix PREFIX]
-                                       --pattern PATTERN
-                                       [--description DESCRIPTION]</computeroutput></screen>
-        <para>
-Create new blacklist
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--pattern PATTERN</command></term>
-    <listitem>
-      <para>
-        Blacklist pattern
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_blacklist_delete">
-        <title>openstack zone blacklist delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone blacklist delete [-h] id</computeroutput></screen>
-        <para>
-Delete blacklist
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Blacklist ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_blacklist_list">
-        <title>openstack zone blacklist list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone blacklist list [-h]
-                                     [-f {csv,html,json,json,table,value,yaml,yaml}]
-                                     [-c COLUMN] [--max-width &lt;integer&gt;]
-                                     [--noindent]
-                                     [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
-        <para>
-List blacklists
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_blacklist_set">
-        <title>openstack zone blacklist set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone blacklist set [-h]
-                                    [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                    [-c COLUMN] [--max-width &lt;integer&gt;]
-                                    [--noindent] [--prefix PREFIX] --pattern
-                                    PATTERN
-                                    [--description DESCRIPTION | --no-description]
-                                    id</computeroutput></screen>
-        <para>
-Set blacklist properties
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Blacklist ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--pattern PATTERN</command></term>
-    <listitem>
-      <para>
-        Blacklist pattern
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-description</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_blacklist_show">
-        <title>openstack zone blacklist show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone blacklist show [-h]
+
+    <section xml:id="openstack_cli_with_identity_api_v3">
+       <title>OpenStack with Identity API v3 commands (diff)</title>
+    <para>
+       You can select the Identity API version to use by adding the
+       <parameter>--os-identity-api-version</parameter> parameter or by setting
+       the corresponding environment variable:
+<screen><prompt>$</prompt> <userinput>export OS_IDENTITY_API_VERSION=3</userinput></screen>
+</para>
+<para>
+This section documents only the difference in subcommands available for the openstack client when the identity API version is changed from v2 to v3.
+</para>
+    <section xml:id="openstackclient_subcommand_access_token_create_with_identity_api_v3">
+        <title>openstack access token create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 access token create [-h]
                                      [-f {html,json,json,shell,table,value,yaml,yaml}]
                                      [-c COLUMN] [--max-width &lt;integer&gt;]
                                      [--noindent] [--prefix PREFIX]
-                                     id</computeroutput></screen>
+                                     --consumer-key &lt;consumer-key&gt;
+                                     --consumer-secret &lt;consumer-secret&gt;
+                                     --request-key &lt;request-key&gt;
+                                     --request-secret &lt;request-secret&gt;
+                                     --verifier &lt;verifier&gt;</computeroutput></screen>
         <para>
-Show blacklist details
+Create an access token
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--consumer-key &lt;consumer-key&gt;</command></term>
+    <listitem>
+      <para>
+      Consumer key (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--consumer-secret &lt;consumer-secret&gt;</command></term>
+    <listitem>
+      <para>
+      Consumer secret (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--request-key &lt;request-key&gt;</command></term>
+    <listitem>
+      <para>
+      Request token to exchange for access token (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--request-secret &lt;request-secret&gt;</command></term>
+    <listitem>
+      <para>
+      Secret associated with &lt;request-key&gt; (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--verifier &lt;verifier&gt;</command></term>
+    <listitem>
+      <para>
+      Verifier associated with &lt;request-key&gt; (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_consumer_create_with_identity_api_v3">
+        <title>openstack consumer create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 consumer create [-h]
+                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                 [-c COLUMN] [--max-width &lt;integer&gt;]
+                                 [--noindent] [--prefix PREFIX]
+                                 [--description &lt;description&gt;]</computeroutput></screen>
+        <para>
+Create new consumer
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New consumer description
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_consumer_delete_with_identity_api_v3">
+        <title>openstack consumer delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 consumer delete [-h] &lt;consumer&gt;</computeroutput></screen>
+        <para>
+Delete consumer
         </para>  <variablelist wordsize="10">
     <title>Positional arguments</title>
   <varlistentry>
-    <term><command>id</command></term>
+    <term><command>&lt;consumer&gt;</command></term>
     <listitem>
       <para>
-        Blacklist ID
+        Consumer to delete
       </para>
     </listitem>
   </varlistentry>
@@ -9131,92 +8193,489 @@ Show blacklist details
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_zone_create">
-        <title>openstack zone create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone create [-h]
+    <section xml:id="openstackclient_subcommand_consumer_list_with_identity_api_v3">
+        <title>openstack consumer list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 consumer list [-h]
+                               [-f {csv,html,json,json,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width &lt;integer&gt;]
+                               [--noindent]
+                               [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List consumers
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_consumer_set_with_identity_api_v3">
+        <title>openstack consumer set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 consumer set [-h] [--description &lt;description&gt;] &lt;consumer&gt;</computeroutput></screen>
+        <para>
+Set consumer properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;consumer&gt;</command></term>
+    <listitem>
+      <para>
+        Consumer to modify
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New consumer description
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_consumer_show_with_identity_api_v3">
+        <title>openstack consumer show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 consumer show [-h]
+                               [-f {html,json,json,shell,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width &lt;integer&gt;]
+                               [--noindent] [--prefix PREFIX]
+                               &lt;consumer&gt;</computeroutput></screen>
+        <para>
+Display consumer details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;consumer&gt;</command></term>
+    <listitem>
+      <para>
+        Consumer to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_credential_create_with_identity_api_v3">
+        <title>openstack credential create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 credential create [-h]
+                                   [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                   [-c COLUMN] [--max-width &lt;integer&gt;]
+                                   [--noindent] [--prefix PREFIX]
+                                   [--type &lt;type&gt;] [--project &lt;project&gt;]
+                                   &lt;user&gt; &lt;data&gt;</computeroutput></screen>
+        <para>
+Create credential command
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        Name or ID of user that owns the credential
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>&lt;data&gt;</command></term>
+    <listitem>
+      <para>
+        New credential data
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--type &lt;type&gt;</command></term>
+    <listitem>
+      <para>
+        New credential type
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project &lt;project&gt;</command></term>
+    <listitem>
+      <para>
+        Project name or ID which limits the scope of the
+      credential
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_credential_delete_with_identity_api_v3">
+        <title>openstack credential delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 credential delete [-h] &lt;credential-id&gt;</computeroutput></screen>
+        <para>
+Delete credential command
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;credential-id&gt;</command></term>
+    <listitem>
+      <para>
+        ID of credential to delete
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_credential_list_with_identity_api_v3">
+        <title>openstack credential list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 credential list [-h]
+                                 [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                 [-c COLUMN] [--max-width &lt;integer&gt;]
+                                 [--noindent]
+                                 [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List credential command
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_credential_set_with_identity_api_v3">
+        <title>openstack credential set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 credential set [-h] [--user &lt;user&gt;] [--type &lt;type&gt;]
+                                [--data &lt;data&gt;] [--project &lt;project&gt;]
+                                &lt;credential-id&gt;</computeroutput></screen>
+        <para>
+Set credential command
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;credential-id&gt;</command></term>
+    <listitem>
+      <para>
+        ID of credential to change
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user &lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        Name or ID of user that owns the credential
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--type &lt;type&gt;</command></term>
+    <listitem>
+      <para>
+        New credential type
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--data &lt;data&gt;</command></term>
+    <listitem>
+      <para>
+        New credential data
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project &lt;project&gt;</command></term>
+    <listitem>
+      <para>
+        Project name or ID which limits the scope of the
+      credential
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_credential_show_with_identity_api_v3">
+        <title>openstack credential show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 credential show [-h]
+                                 [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                 [-c COLUMN] [--max-width &lt;integer&gt;]
+                                 [--noindent] [--prefix PREFIX]
+                                 &lt;credential-id&gt;</computeroutput></screen>
+        <para>
+Show credential command
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;credential-id&gt;</command></term>
+    <listitem>
+      <para>
+        ID of credential to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_domain_create_with_identity_api_v3">
+        <title>openstack domain create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 domain create [-h]
+                               [-f {html,json,json,shell,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width &lt;integer&gt;]
+                               [--noindent] [--prefix PREFIX]
+                               [--description &lt;description&gt;]
+                               [--enable | --disable] [--or-show]
+                               &lt;domain-name&gt;</computeroutput></screen>
+        <para>
+Create new domain
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;domain-name&gt;</command></term>
+    <listitem>
+      <para>
+        New domain name
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New domain description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable domain (default)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable domain
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--or-show</command></term>
+    <listitem>
+      <para>
+        Return existing domain
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_domain_delete_with_identity_api_v3">
+        <title>openstack domain delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 domain delete [-h] &lt;domain&gt;</computeroutput></screen>
+        <para>
+Delete domain
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain to delete (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_domain_list_with_identity_api_v3">
+        <title>openstack domain list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 domain list [-h]
+                             [-f {csv,html,json,json,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                             [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List domains
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_domain_set_with_identity_api_v3">
+        <title>openstack domain set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 domain set [-h] [--name &lt;name&gt;] [--description &lt;description&gt;]
+                            [--enable | --disable]
+                            &lt;domain&gt;</computeroutput></screen>
+        <para>
+Set domain properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain to modify (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--name &lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        New domain name
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New domain description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable domain
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable domain
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_domain_show_with_identity_api_v3">
+        <title>openstack domain show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 domain show [-h]
                              [-f {html,json,json,shell,table,value,yaml,yaml}]
                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                             [--prefix PREFIX] [--email EMAIL] [--type TYPE]
-                             [--ttl TTL] [--description DESCRIPTION]
-                             [--masters MASTERS [MASTERS ...]]
-                             name</computeroutput></screen>
+                             [--prefix PREFIX]
+                             &lt;domain&gt;</computeroutput></screen>
         <para>
-Create new zone
+Display domain details
         </para>  <variablelist wordsize="10">
     <title>Positional arguments</title>
   <varlistentry>
-    <term><command>name</command></term>
+    <term><command>&lt;domain&gt;</command></term>
     <listitem>
       <para>
-        Zone Name
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--email EMAIL</command></term>
-    <listitem>
-      <para>
-        Zone Email
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--type TYPE</command></term>
-    <listitem>
-      <para>
-        Zone Type
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--ttl TTL</command></term>
-    <listitem>
-      <para>
-        Time To Live (Seconds)
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--masters MASTERS [MASTERS ...]</command></term>
-    <listitem>
-      <para>
-      Zone Masters
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_delete">
-        <title>openstack zone delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone delete [-h] id</computeroutput></screen>
-        <para>
-Delete zone
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone ID
+        Domain to display (name or ID)
       </para>
     </listitem>
   </varlistentry>
@@ -9233,54 +8692,21 @@ Delete zone
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_zone_list">
-        <title>openstack zone list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone list [-h]
-                           [-f {csv,html,json,json,table,value,yaml,yaml}]
-                           [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                           [--quote {all,minimal,none,nonnumeric}]
-                           [--type TYPE]</computeroutput></screen>
+    <section xml:id="openstackclient_subcommand_endpoint_set_with_identity_api_v3">
+        <title>openstack endpoint set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 endpoint set [-h] [--region &lt;region-id&gt;]
+                              [--interface &lt;interface&gt;] [--url &lt;url&gt;]
+                              [--service &lt;service&gt;] [--enable | --disable]
+                              &lt;endpoint-id&gt;</computeroutput></screen>
         <para>
-List zones
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--type TYPE</command></term>
-    <listitem>
-      <para>
-        Zone Type
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_set">
-        <title>openstack zone set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone set [-h]
-                          [-f {html,json,json,shell,table,value,yaml,yaml}]
-                          [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                          [--prefix PREFIX] [--name NAME] [--email EMAIL]
-                          [--ttl TTL]
-                          [--description DESCRIPTION | --no-description]
-                          [--masters MASTERS [MASTERS ...]]
-                          id</computeroutput></screen>
-        <para>
-Set zone properties
+Set endpoint properties
         </para>  <variablelist wordsize="10">
     <title>Positional arguments</title>
   <varlistentry>
-    <term><command>id</command></term>
+    <term><command>&lt;endpoint-id&gt;</command></term>
     <listitem>
       <para>
-        Zone ID
+        Endpoint ID to modify
       </para>
     </listitem>
   </varlistentry>
@@ -9296,241 +8722,65 @@ Set zone properties
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><command>--name NAME</command></term>
+    <term><command>--region &lt;region-id&gt;</command></term>
     <listitem>
       <para>
-        Zone Name
+        New endpoint region ID
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><command>--email EMAIL</command></term>
+    <term><command>--interface &lt;interface&gt;</command></term>
     <listitem>
       <para>
-        Zone Email
+      New endpoint interface type (admin, public or
+      internal)
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><command>--ttl TTL</command></term>
+    <term><command>--url &lt;url&gt;</command></term>
     <listitem>
       <para>
-        Time To Live (Seconds)
+        New endpoint URL
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
+    <term><command>--service &lt;service&gt;</command></term>
     <listitem>
       <para>
-      Description
+        New endpoint service (name or ID)
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><command>--no-description</command></term>
+    <term><command>--enable</command></term>
     <listitem>
       <para>
+        Enable endpoint
       </para>
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><command>--masters MASTERS [MASTERS ...]</command></term>
+    <term><command>--disable</command></term>
     <listitem>
       <para>
-      Zone Masters
+        Disable endpoint
       </para>
     </listitem>
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_zone_show">
-        <title>openstack zone show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone show [-h]
-                           [-f {html,json,json,shell,table,value,yaml,yaml}]
-                           [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
-                           [--prefix PREFIX]
-                           id</computeroutput></screen>
+    <section xml:id="openstackclient_subcommand_federation_domain_list_with_identity_api_v3">
+        <title>openstack federation domain list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation domain list [-h]
+                                        [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                        [-c COLUMN] [--max-width &lt;integer&gt;]
+                                        [--noindent]
+                                        [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
         <para>
-Show zone details
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_accept_request">
-        <title>openstack zone transfer accept request</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer accept request [-h] --transfer-id TRANSFER_ID
-                                              --key KEY</computeroutput></screen>
-        <para>
-Accept a Zone Transfer Request
-        </para>  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--transfer-id TRANSFER_ID</command></term>
-    <listitem>
-      <para>
-      Transfer ID
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--key KEY</command></term>
-    <listitem>
-      <para>
-        Transfer Key
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_accept_show">
-        <title>openstack zone transfer accept show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer accept show [-h]
-                                           [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                           [-c COLUMN] [--max-width &lt;integer&gt;]
-                                           [--noindent] [--prefix PREFIX]
-                                           id</computeroutput></screen>
-        <para>
-Show Zone Transfer Accept
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone Tranfer Accept ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_request_create">
-        <title>openstack zone transfer request create</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer request create [-h]
-                                              [-f {html,json,json,shell,table,value,yaml,yaml}]
-                                              [-c COLUMN]
-                                              [--max-width &lt;integer&gt;]
-                                              [--noindent] [--prefix PREFIX]
-                                              --target-project-id
-                                              TARGET_PROJECT_ID
-                                              [--description DESCRIPTION]
-                                              zone_id</computeroutput></screen>
-        <para>
-Create new zone transfer request
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>zone_id</command></term>
-    <listitem>
-      <para>
-        Zone ID to transfer.
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--target-project-id TARGET_PROJECT_ID</command></term>
-    <listitem>
-      <para>
-      Target Project ID to transfer to.
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_request_delete">
-        <title>openstack zone transfer request delete</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer request delete [-h] id</computeroutput></screen>
-        <para>
-        </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone Transfer ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
-    <title>Optional arguments</title>
-  <varlistentry>
-    <term><command>-h, --help</command></term>
-    <listitem>
-      <para>
-        show this help message and exit
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-    </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_request_list">
-        <title>openstack zone transfer request list</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer request list [-h]
-                                            [-f {csv,html,json,json,table,value,yaml,yaml}]
-                                            [-c COLUMN]
-                                            [--max-width &lt;integer&gt;]
-                                            [--noindent]
-                                            [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
-        <para>
-List zone transfer requests
+List accessible domains
         </para>  <variablelist wordsize="10">
     <title>Optional arguments</title>
   <varlistentry>
@@ -9543,25 +8793,16 @@ List zone transfer requests
   </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_request_set">
-        <title>openstack zone transfer request set</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer request set [-h]
-                                           [--description DESCRIPTION | --no-description]
-                                           id</computeroutput></screen>
+    <section xml:id="openstackclient_subcommand_federation_project_list_with_identity_api_v3">
+        <title>openstack federation project list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation project list [-h]
+                                         [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                         [-c COLUMN] [--max-width &lt;integer&gt;]
+                                         [--noindent]
+                                         [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
         <para>
-Set Transfer
+List accessible projects
         </para>  <variablelist wordsize="10">
-    <title>Positional arguments</title>
-  <varlistentry>
-    <term><command>id</command></term>
-    <listitem>
-      <para>
-        Zone Transfer ID
-      </para>
-    </listitem>
-  </varlistentry>
- </variablelist>
-  <variablelist wordsize="10">
     <title>Optional arguments</title>
   <varlistentry>
     <term><command>-h, --help</command></term>
@@ -9571,40 +8812,722 @@ Set Transfer
       </para>
     </listitem>
   </varlistentry>
-  <varlistentry>
-    <term><command>--description DESCRIPTION</command></term>
-    <listitem>
-      <para>
-      Description
-      </para>
-    </listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><command>--no-description</command></term>
-    <listitem>
-      <para>
-      </para>
-    </listitem>
-  </varlistentry>
  </variablelist>
     </section>
-    <section xml:id="openstackclient_subcommand_zone_transfer_request_show">
-        <title>openstack zone transfer request show</title>
-        <screen><computeroutput>usage: openstack --os-auth-type token zone transfer request show [-h]
+    <section xml:id="openstackclient_subcommand_federation_protocol_create_with_identity_api_v3">
+        <title>openstack federation protocol create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation protocol create [-h]
                                             [-f {html,json,json,shell,table,value,yaml,yaml}]
                                             [-c COLUMN]
                                             [--max-width &lt;integer&gt;]
                                             [--noindent] [--prefix PREFIX]
-                                            id</computeroutput></screen>
+                                            --identity-provider
+                                            &lt;identity-provider&gt; --mapping
+                                            &lt;mapping&gt;
+                                            &lt;name&gt;</computeroutput></screen>
         <para>
-Show zonet transfer details
+Create new federation protocol
         </para>  <variablelist wordsize="10">
     <title>Positional arguments</title>
   <varlistentry>
-    <term><command>id</command></term>
+    <term><command>&lt;name&gt;</command></term>
     <listitem>
       <para>
-        Zone Tranfer ID
+        New federation protocol name (must be unique per
+      identity provider)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--identity-provider &lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+      Identity provider that will support the new federation
+      protocol (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--mapping &lt;mapping&gt;</command></term>
+    <listitem>
+      <para>
+        Mapping that is to be used (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_federation_protocol_delete_with_identity_api_v3">
+        <title>openstack federation protocol delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation protocol delete [-h] --identity-provider
+                                            &lt;identity-provider&gt;
+                                            &lt;federation-protocol&gt;</computeroutput></screen>
+        <para>
+Delete federation protocol
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;federation-protocol&gt;</command></term>
+    <listitem>
+      <para>
+      Federation protocol to delete (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--identity-provider &lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+      Identity provider that supports &lt;federation-protocol&gt;
+      (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_federation_protocol_list_with_identity_api_v3">
+        <title>openstack federation protocol list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation protocol list [-h]
+                                          [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                          [-c COLUMN] [--max-width &lt;integer&gt;]
+                                          [--noindent]
+                                          [--quote {all,minimal,none,nonnumeric}]
+                                          --identity-provider
+                                          &lt;identity-provider&gt;</computeroutput></screen>
+        <para>
+List federation protocols
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--identity-provider &lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+      Identity provider to list (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_federation_protocol_set_with_identity_api_v3">
+        <title>openstack federation protocol set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation protocol set [-h] --identity-provider
+                                         &lt;identity-provider&gt;
+                                         [--mapping &lt;mapping&gt;]
+                                         &lt;name&gt;</computeroutput></screen>
+        <para>
+Set federation protocol properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        Federation protocol to modify (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--identity-provider &lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+      Identity provider that supports &lt;federation-protocol&gt;
+      (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--mapping &lt;mapping&gt;</command></term>
+    <listitem>
+      <para>
+        Mapping that is to be used (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_federation_protocol_show_with_identity_api_v3">
+        <title>openstack federation protocol show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 federation protocol show [-h]
+                                          [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                          [-c COLUMN] [--max-width &lt;integer&gt;]
+                                          [--noindent] [--prefix PREFIX]
+                                          --identity-provider
+                                          &lt;identity-provider&gt;
+                                          &lt;federation-protocol&gt;</computeroutput></screen>
+        <para>
+Display federation protocol details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;federation-protocol&gt;</command></term>
+    <listitem>
+      <para>
+      Federation protocol to display (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--identity-provider &lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+      Identity provider that supports &lt;federation-protocol&gt;
+      (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_add_user_with_identity_api_v3">
+        <title>openstack group add user (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group add user [-h] [--group-domain &lt;group-domain&gt;]
+                                [--user-domain &lt;user-domain&gt;]
+                                &lt;group&gt; &lt;user&gt;</computeroutput></screen>
+        <para>
+Add user to group
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group to contain &lt;user&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>&lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        User to add to &lt;group&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--group-domain &lt;group-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the group belongs to (name or ID). This can be
+      used in case collisions between group names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user-domain &lt;user-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the user belongs to (name or ID). This can be
+      used in case collisions between user names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_contains_user_with_identity_api_v3">
+        <title>openstack group contains user (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group contains user [-h] [--group-domain &lt;group-domain&gt;]
+                                     [--user-domain &lt;user-domain&gt;]
+                                     &lt;group&gt; &lt;user&gt;</computeroutput></screen>
+        <para>
+Check user membership in group
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group to check (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>&lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        User to check (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--group-domain &lt;group-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the group belongs to (name or ID). This can be
+      used in case collisions between group names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user-domain &lt;user-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the user belongs to (name or ID). This can be
+      used in case collisions between user names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_create_with_identity_api_v3">
+        <title>openstack group create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group create [-h]
+                              [-f {html,json,json,shell,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                              [--prefix PREFIX] [--domain &lt;domain&gt;]
+                              [--description &lt;description&gt;] [--or-show]
+                              &lt;group-name&gt;</computeroutput></screen>
+        <para>
+Create new group
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group-name&gt;</command></term>
+    <listitem>
+      <para>
+        New group name
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain to contain new group (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New group description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--or-show</command></term>
+    <listitem>
+      <para>
+        Return existing group
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_delete_with_identity_api_v3">
+        <title>openstack group delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group delete [-h] [--domain &lt;domain&gt;] &lt;group&gt; [&lt;group&gt; ...]</computeroutput></screen>
+        <para>
+Delete group(s)
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group(s) to delete (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain containing group(s) (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_list_with_identity_api_v3">
+        <title>openstack group list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group list [-h]
+                            [-f {csv,html,json,json,table,value,yaml,yaml}]
+                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                            [--quote {all,minimal,none,nonnumeric}]
+                            [--domain &lt;domain&gt;] [--user &lt;user&gt;]
+                            [--user-domain &lt;user-domain&gt;] [--long]</computeroutput></screen>
+        <para>
+List groups
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Filter group list by &lt;domain&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user &lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        Filter group list by &lt;user&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user-domain &lt;user-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the user belongs to (name or ID). This can be
+      used in case collisions between user names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--long</command></term>
+    <listitem>
+      <para>
+        List additional fields in output
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_remove_user_with_identity_api_v3">
+        <title>openstack group remove user (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group remove user [-h] [--group-domain &lt;group-domain&gt;]
+                                   [--user-domain &lt;user-domain&gt;]
+                                   &lt;group&gt; &lt;user&gt;</computeroutput></screen>
+        <para>
+Remove user from group
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group containing &lt;user&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>&lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        User to remove from &lt;group&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--group-domain &lt;group-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the group belongs to (name or ID). This can be
+      used in case collisions between group names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user-domain &lt;user-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the user belongs to (name or ID). This can be
+      used in case collisions between user names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_set_with_identity_api_v3">
+        <title>openstack group set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group set [-h] [--domain &lt;domain&gt;] [--name &lt;name&gt;]
+                           [--description &lt;description&gt;]
+                           &lt;group&gt;</computeroutput></screen>
+        <para>
+Set group properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group to modify (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain containing &lt;group&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--name &lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        New group name
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New group description
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_group_show_with_identity_api_v3">
+        <title>openstack group show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 group show [-h]
+                            [-f {html,json,json,shell,table,value,yaml,yaml}]
+                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                            [--prefix PREFIX] [--domain &lt;domain&gt;]
+                            &lt;group&gt;</computeroutput></screen>
+        <para>
+Display group details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group to display (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain containing &lt;group&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_identity_provider_create_with_identity_api_v3">
+        <title>openstack identity provider create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 identity provider create [-h]
+                                          [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                          [-c COLUMN] [--max-width &lt;integer&gt;]
+                                          [--noindent] [--prefix PREFIX]
+                                          [--remote-id &lt;remote-id&gt; | --remote-id-file &lt;file-name&gt;]
+                                          [--description &lt;description&gt;]
+                                          [--enable | --disable]
+                                          &lt;name&gt;</computeroutput></screen>
+        <para>
+Create new identity provider
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        New identity provider name (must be unique)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--remote-id &lt;remote-id&gt;</command></term>
+    <listitem>
+      <para>
+      Remote IDs to associate with the Identity Provider
+      (repeat to provide multiple values)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--remote-id-file &lt;file-name&gt;</command></term>
+    <listitem>
+      <para>
+      Name of a file that contains many remote IDs to
+      associate with the identity provider, one per line
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New identity provider description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable identity provider (default)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable the identity provider
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_identity_provider_delete_with_identity_api_v3">
+        <title>openstack identity provider delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 identity provider delete [-h] &lt;identity-provider&gt;</computeroutput></screen>
+        <para>
+Delete identity provider
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+        Identity provider to delete
       </para>
     </listitem>
   </varlistentry>
@@ -9621,4 +9544,1416 @@ Show zonet transfer details
   </varlistentry>
  </variablelist>
     </section>
+    <section xml:id="openstackclient_subcommand_identity_provider_list_with_identity_api_v3">
+        <title>openstack identity provider list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 identity provider list [-h]
+                                        [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                        [-c COLUMN] [--max-width &lt;integer&gt;]
+                                        [--noindent]
+                                        [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List identity providers
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_identity_provider_set_with_identity_api_v3">
+        <title>openstack identity provider set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 identity provider set [-h]
+                                       [--remote-id &lt;remote-id&gt; | --remote-id-file &lt;file-name&gt;]
+                                       [--enable | --disable]
+                                       &lt;identity-provider&gt;</computeroutput></screen>
+        <para>
+Set identity provider properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+        Identity provider to modify
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--remote-id &lt;remote-id&gt;</command></term>
+    <listitem>
+      <para>
+      Remote IDs to associate with the Identity Provider
+      (repeat to provide multiple values)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--remote-id-file &lt;file-name&gt;</command></term>
+    <listitem>
+      <para>
+      Name of a file that contains many remote IDs to
+      associate with the identity provider, one per line
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable the identity provider
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable the identity provider
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_identity_provider_show_with_identity_api_v3">
+        <title>openstack identity provider show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 identity provider show [-h]
+                                        [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                        [-c COLUMN] [--max-width &lt;integer&gt;]
+                                        [--noindent] [--prefix PREFIX]
+                                        &lt;identity-provider&gt;</computeroutput></screen>
+        <para>
+Display identity provider details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;identity-provider&gt;</command></term>
+    <listitem>
+      <para>
+        Identity provider to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_mapping_create_with_identity_api_v3">
+        <title>openstack mapping create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 mapping create [-h]
+                                [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                [-c COLUMN] [--max-width &lt;integer&gt;]
+                                [--noindent] [--prefix PREFIX] --rules
+                                &lt;filename&gt;
+                                &lt;name&gt;</computeroutput></screen>
+        <para>
+Create new mapping
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        New mapping name (must be unique)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--rules &lt;filename&gt;</command></term>
+    <listitem>
+      <para>
+        Filename that contains a set of mapping rules
+      (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_mapping_delete_with_identity_api_v3">
+        <title>openstack mapping delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 mapping delete [-h] &lt;mapping&gt;</computeroutput></screen>
+        <para>
+Delete mapping
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;mapping&gt;</command></term>
+    <listitem>
+      <para>
+        Mapping to delete
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_mapping_list_with_identity_api_v3">
+        <title>openstack mapping list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 mapping list [-h]
+                              [-f {csv,html,json,json,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                              [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List mappings
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_mapping_set_with_identity_api_v3">
+        <title>openstack mapping set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 mapping set [-h] [--rules &lt;filename&gt;] &lt;name&gt;</computeroutput></screen>
+        <para>
+Set mapping properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        Mapping to modify
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--rules &lt;filename&gt;</command></term>
+    <listitem>
+      <para>
+        Filename that contains a new set of mapping rules
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_mapping_show_with_identity_api_v3">
+        <title>openstack mapping show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 mapping show [-h]
+                              [-f {html,json,json,shell,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                              [--prefix PREFIX]
+                              &lt;mapping&gt;</computeroutput></screen>
+        <para>
+Display mapping details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;mapping&gt;</command></term>
+    <listitem>
+      <para>
+        Mapping to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_policy_create_with_identity_api_v3">
+        <title>openstack policy create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 policy create [-h]
+                               [-f {html,json,json,shell,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width &lt;integer&gt;]
+                               [--noindent] [--prefix PREFIX] [--type &lt;type&gt;]
+                               &lt;filename&gt;</computeroutput></screen>
+        <para>
+Create new policy
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;filename&gt;</command></term>
+    <listitem>
+      <para>
+        New serialized policy rules file
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--type &lt;type&gt;</command></term>
+    <listitem>
+      <para>
+        New MIME type of the policy rules file (defaults to
+      application/json)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_policy_delete_with_identity_api_v3">
+        <title>openstack policy delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 policy delete [-h] &lt;policy&gt;</computeroutput></screen>
+        <para>
+Delete policy
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;policy&gt;</command></term>
+    <listitem>
+      <para>
+        Policy to delete
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_policy_list_with_identity_api_v3">
+        <title>openstack policy list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 policy list [-h]
+                             [-f {csv,html,json,json,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                             [--quote {all,minimal,none,nonnumeric}] [--long]</computeroutput></screen>
+        <para>
+List policies
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--long</command></term>
+    <listitem>
+      <para>
+        List additional fields in output
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_policy_set_with_identity_api_v3">
+        <title>openstack policy set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 policy set [-h] [--type &lt;type&gt;] [--rules &lt;filename&gt;] &lt;policy&gt;</computeroutput></screen>
+        <para>
+Set policy properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;policy&gt;</command></term>
+    <listitem>
+      <para>
+        Policy to modify
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--type &lt;type&gt;</command></term>
+    <listitem>
+      <para>
+        New MIME type of the policy rules file
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--rules &lt;filename&gt;</command></term>
+    <listitem>
+      <para>
+        New serialized policy rules file
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_policy_show_with_identity_api_v3">
+        <title>openstack policy show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 policy show [-h]
+                             [-f {html,json,json,shell,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                             [--prefix PREFIX]
+                             &lt;policy&gt;</computeroutput></screen>
+        <para>
+Display policy details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;policy&gt;</command></term>
+    <listitem>
+      <para>
+        Policy to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_region_create_with_identity_api_v3">
+        <title>openstack region create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 region create [-h]
+                               [-f {html,json,json,shell,table,value,yaml,yaml}]
+                               [-c COLUMN] [--max-width &lt;integer&gt;]
+                               [--noindent] [--prefix PREFIX]
+                               [--parent-region &lt;region-id&gt;]
+                               [--description &lt;description&gt;] [--url &lt;url&gt;]
+                               &lt;region-id&gt;</computeroutput></screen>
+        <para>
+Create new region
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+        New region ID
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--parent-region &lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+      Parent region ID
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New region description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--url &lt;url&gt;</command></term>
+    <listitem>
+      <para>
+        New region url
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_region_delete_with_identity_api_v3">
+        <title>openstack region delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 region delete [-h] &lt;region-id&gt;</computeroutput></screen>
+        <para>
+Delete region
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+        Region ID to delete
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_region_list_with_identity_api_v3">
+        <title>openstack region list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 region list [-h]
+                             [-f {csv,html,json,json,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                             [--quote {all,minimal,none,nonnumeric}]
+                             [--parent-region &lt;region-id&gt;]</computeroutput></screen>
+        <para>
+List regions
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--parent-region &lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+      Filter by parent region ID
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_region_set_with_identity_api_v3">
+        <title>openstack region set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 region set [-h] [--parent-region &lt;region-id&gt;]
+                            [--description &lt;description&gt;] [--url &lt;url&gt;]
+                            &lt;region-id&gt;</computeroutput></screen>
+        <para>
+Set region properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+        Region to modify
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--parent-region &lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+      New parent region ID
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New region description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--url &lt;url&gt;</command></term>
+    <listitem>
+      <para>
+        New region url
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_region_show_with_identity_api_v3">
+        <title>openstack region show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 region show [-h]
+                             [-f {html,json,json,shell,table,value,yaml,yaml}]
+                             [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                             [--prefix PREFIX]
+                             &lt;region-id&gt;</computeroutput></screen>
+        <para>
+Display region details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;region-id&gt;</command></term>
+    <listitem>
+      <para>
+        Region to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_request_token_authorize_with_identity_api_v3">
+        <title>openstack request token authorize (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 request token authorize [-h]
+                                         [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                         [-c COLUMN] [--max-width &lt;integer&gt;]
+                                         [--noindent] [--prefix PREFIX]
+                                         --request-key &lt;request-key&gt; --role
+                                         &lt;role&gt;</computeroutput></screen>
+        <para>
+Authorize a request token
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--request-key &lt;request-key&gt;</command></term>
+    <listitem>
+      <para>
+      Request token to authorize (ID only) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--role &lt;role&gt;</command></term>
+    <listitem>
+      <para>
+        Roles to authorize (name or ID) (repeat to set
+      multiple values) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_request_token_create_with_identity_api_v3">
+        <title>openstack request token create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 request token create [-h]
+                                      [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                      [-c COLUMN] [--max-width &lt;integer&gt;]
+                                      [--noindent] [--prefix PREFIX]
+                                      --consumer-key &lt;consumer-key&gt;
+                                      --consumer-secret &lt;consumer-secret&gt;
+                                      --project &lt;project&gt; [--domain &lt;domain&gt;]</computeroutput></screen>
+        <para>
+Create a request token
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--consumer-key &lt;consumer-key&gt;</command></term>
+    <listitem>
+      <para>
+      Consumer key (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--consumer-secret &lt;consumer-secret&gt;</command></term>
+    <listitem>
+      <para>
+      Consumer secret (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project &lt;project&gt;</command></term>
+    <listitem>
+      <para>
+        Project that consumer wants to access (name or ID)
+      (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain owning &lt;project&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_role_assignment_list_with_identity_api_v3">
+        <title>openstack role assignment list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 role assignment list [-h]
+                                      [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                      [-c COLUMN] [--max-width &lt;integer&gt;]
+                                      [--noindent]
+                                      [--quote {all,minimal,none,nonnumeric}]
+                                      [--effective] [--role &lt;role&gt;]
+                                      [--user &lt;user&gt;]
+                                      [--user-domain &lt;user-domain&gt;]
+                                      [--group &lt;group&gt;]
+                                      [--group-domain &lt;group-domain&gt;]
+                                      [--domain &lt;domain&gt; | --project &lt;project&gt;]
+                                      [--project-domain &lt;project-domain&gt;]
+                                      [--inherited]</computeroutput></screen>
+        <para>
+List role assignments
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--effective</command></term>
+    <listitem>
+      <para>
+        Returns only effective role assignments
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--role &lt;role&gt;</command></term>
+    <listitem>
+      <para>
+        Role to filter (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user &lt;user&gt;</command></term>
+    <listitem>
+      <para>
+        User to filter (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--user-domain &lt;user-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the user belongs to (name or ID). This can be
+      used in case collisions between user names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--group &lt;group&gt;</command></term>
+    <listitem>
+      <para>
+        Group to filter (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--group-domain &lt;group-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the group belongs to (name or ID). This can be
+      used in case collisions between group names exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--domain &lt;domain&gt;</command></term>
+    <listitem>
+      <para>
+        Domain to filter (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project &lt;project&gt;</command></term>
+    <listitem>
+      <para>
+        Project to filter (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project-domain &lt;project-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the project belongs to (name or ID). This can
+      be used in case collisions between project names
+      exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--inherited</command></term>
+    <listitem>
+      <para>
+        Specifies if the role grant is inheritable to the sub
+      projects
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_role_set_with_identity_api_v3">
+        <title>openstack role set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 role set [-h] [--name &lt;name&gt;] &lt;role&gt;</computeroutput></screen>
+        <para>
+Set role properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;role&gt;</command></term>
+    <listitem>
+      <para>
+        Role to modify (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--name &lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        Set role name
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_service_provider_create_with_identity_api_v3">
+        <title>openstack service provider create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 service provider create [-h]
+                                         [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                         [-c COLUMN] [--max-width &lt;integer&gt;]
+                                         [--noindent] [--prefix PREFIX]
+                                         --auth-url &lt;auth-url&gt;
+                                         [--description &lt;description&gt;]
+                                         --service-provider-url &lt;sp-url&gt;
+                                         [--enable | --disable]
+                                         &lt;name&gt;</computeroutput></screen>
+        <para>
+Create new service provider
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;name&gt;</command></term>
+    <listitem>
+      <para>
+        New service provider name (must be unique)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--auth-url &lt;auth-url&gt;</command></term>
+    <listitem>
+      <para>
+      Authentication URL of remote federated service
+      provider (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New service provider description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--service-provider-url &lt;sp-url&gt;</command></term>
+    <listitem>
+      <para>
+      A service URL where SAML assertions are being sent
+      (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable the service provider (default)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable the service provider
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_service_provider_delete_with_identity_api_v3">
+        <title>openstack service provider delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 service provider delete [-h] &lt;service-provider&gt;</computeroutput></screen>
+        <para>
+Delete service provider
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;service-provider&gt;</command></term>
+    <listitem>
+      <para>
+        Service provider to delete
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_service_provider_list_with_identity_api_v3">
+        <title>openstack service provider list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 service provider list [-h]
+                                       [-f {csv,html,json,json,table,value,yaml,yaml}]
+                                       [-c COLUMN] [--max-width &lt;integer&gt;]
+                                       [--noindent]
+                                       [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List service providers
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_service_provider_set_with_identity_api_v3">
+        <title>openstack service provider set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 service provider set [-h] [--auth-url &lt;auth-url&gt;]
+                                      [--description &lt;description&gt;]
+                                      [--service-provider-url &lt;sp-url&gt;]
+                                      [--enable | --disable]
+                                      &lt;service-provider&gt;</computeroutput></screen>
+        <para>
+Set service provider properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;service-provider&gt;</command></term>
+    <listitem>
+      <para>
+        Service provider to modify
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--auth-url &lt;auth-url&gt;</command></term>
+    <listitem>
+      <para>
+      New Authentication URL of remote federated service
+      provider
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New service provider description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--service-provider-url &lt;sp-url&gt;</command></term>
+    <listitem>
+      <para>
+      New service provider URL, where SAML assertions are
+      sent
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable the service provider
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable the service provider
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_service_provider_show_with_identity_api_v3">
+        <title>openstack service provider show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 service provider show [-h]
+                                       [-f {html,json,json,shell,table,value,yaml,yaml}]
+                                       [-c COLUMN] [--max-width &lt;integer&gt;]
+                                       [--noindent] [--prefix PREFIX]
+                                       &lt;service-provider&gt;</computeroutput></screen>
+        <para>
+Display service provider details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;service-provider&gt;</command></term>
+    <listitem>
+      <para>
+        Service provider to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_service_set_with_identity_api_v3">
+        <title>openstack service set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 service set [-h] [--type &lt;type&gt;] [--name &lt;service-name&gt;]
+                             [--description &lt;description&gt;]
+                             [--enable | --disable]
+                             &lt;service&gt;</computeroutput></screen>
+        <para>
+Set service properties
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;service&gt;</command></term>
+    <listitem>
+      <para>
+        Service to update (type, name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--type &lt;type&gt;</command></term>
+    <listitem>
+      <para>
+        New service type (compute, image, identity, volume,
+      etc)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--name &lt;service-name&gt;</command></term>
+    <listitem>
+      <para>
+      New service name
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--description &lt;description&gt;</command></term>
+    <listitem>
+      <para>
+      New service description
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--enable</command></term>
+    <listitem>
+      <para>
+        Enable service
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--disable</command></term>
+    <listitem>
+      <para>
+        Disable service
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_trust_create_with_identity_api_v3">
+        <title>openstack trust create (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 trust create [-h]
+                              [-f {html,json,json,shell,table,value,yaml,yaml}]
+                              [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                              [--prefix PREFIX] --project &lt;project&gt; --role
+                              &lt;role&gt; [--impersonate]
+                              [--expiration &lt;expiration&gt;]
+                              [--project-domain &lt;project-domain&gt;]
+                              [--trustor-domain &lt;trustor-domain&gt;]
+                              [--trustee-domain &lt;trustee-domain&gt;]
+                              &lt;trustor-user&gt; &lt;trustee-user&gt;</computeroutput></screen>
+        <para>
+Create new trust
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;trustor-user&gt;</command></term>
+    <listitem>
+      <para>
+        User that is delegating authorization (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>&lt;trustee-user&gt;</command></term>
+    <listitem>
+      <para>
+        User that is assuming authorization (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project &lt;project&gt;</command></term>
+    <listitem>
+      <para>
+        Project being delegated (name or ID) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--role &lt;role&gt;</command></term>
+    <listitem>
+      <para>
+        Roles to authorize (name or ID) (repeat to set
+      multiple values) (required)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--impersonate</command></term>
+    <listitem>
+      <para>
+        Tokens generated from the trust will represent
+      &lt;trustor&gt; (defaults to False)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--expiration &lt;expiration&gt;</command></term>
+    <listitem>
+      <para>
+      Sets an expiration date for the trust (format of YYYY-
+      mm-ddTHH:MM:SS)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--project-domain &lt;project-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain the project belongs to (name or ID). This can
+      be used in case collisions between project names
+      exist.
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--trustor-domain &lt;trustor-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain that contains &lt;trustor&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--trustee-domain &lt;trustee-domain&gt;</command></term>
+    <listitem>
+      <para>
+      Domain that contains &lt;trustee&gt; (name or ID)
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_trust_delete_with_identity_api_v3">
+        <title>openstack trust delete (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 trust delete [-h] &lt;trust&gt; [&lt;trust&gt; ...]</computeroutput></screen>
+        <para>
+Delete trust(s)
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;trust&gt;</command></term>
+    <listitem>
+      <para>
+        Trust(s) to delete
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_trust_list_with_identity_api_v3">
+        <title>openstack trust list (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 trust list [-h]
+                            [-f {csv,html,json,json,table,value,yaml,yaml}]
+                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                            [--quote {all,minimal,none,nonnumeric}]</computeroutput></screen>
+        <para>
+List trusts
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_trust_show_with_identity_api_v3">
+        <title>openstack trust show (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 trust show [-h]
+                            [-f {html,json,json,shell,table,value,yaml,yaml}]
+                            [-c COLUMN] [--max-width &lt;integer&gt;] [--noindent]
+                            [--prefix PREFIX]
+                            &lt;trust&gt;</computeroutput></screen>
+        <para>
+Display trust details
+        </para>  <variablelist wordsize="10">
+    <title>Positional arguments</title>
+  <varlistentry>
+    <term><command>&lt;trust&gt;</command></term>
+    <listitem>
+      <para>
+        Trust to display
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    <section xml:id="openstackclient_subcommand_user_password_set_with_identity_api_v3">
+        <title>openstack user password set (Identity API v3)</title>
+        <screen><computeroutput>usage: openstack --os-auth-type token --os-identity-api-version 3 user password set [-h] [--password &lt;new-password&gt;]</computeroutput></screen>
+        <para>
+Change current user password
+        </para>  <variablelist wordsize="10">
+    <title>Optional arguments</title>
+  <varlistentry>
+    <term><command>-h, --help</command></term>
+    <listitem>
+      <para>
+        show this help message and exit
+      </para>
+    </listitem>
+  </varlistentry>
+  <varlistentry>
+    <term><command>--password &lt;new-password&gt;</command></term>
+    <listitem>
+      <para>
+      New user password
+      </para>
+    </listitem>
+  </varlistentry>
+ </variablelist>
+    </section>
+    </section>
 </chapter>