Merge "Remove deprecated compute commands"

5 files changed, 19 insertions, 58 deletions

diff --git a/doc/source/cli/backwards-incompatible.rst b/doc/source/cli/backwards-incompatible.rst
index 51c1d134..5e2796fc 100644
--- a/doc/source/cli/backwards-incompatible.rst
+++ b/doc/source/cli/backwards-incompatible.rst
@@ -16,9 +16,20 @@ from this backwards incompatible change handling.
 Backwards Incompatible Changes
 ==============================
 
-.. Carry this section as comments until 4.0 release
-.. Release 4.0
-.. -----------
+Release 4.0
+-----------
+
+1. Remove ``ip fixed add|remove`` commands.
+   Use ``server add|remove fixed ip`` commands instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612781
+
+2. Remove ``ip floating add|remove`` commands.
+   Use ``server add|remove floating ip`` commands instead.
+
+  * Removed in: 4.0
+  * Commit: https://review.opendev.org/612781
 
 .. 1. Change ``volume transfer request accept`` to use new option ``--auth-key``
 ..    rather than a second positional argument.
diff --git a/doc/source/cli/command-objects/floating-ip-pool.rst b/doc/source/cli/command-objects/floating-ip-pool.rst
index 9213b86d..5c8f3aa1 100644
--- a/doc/source/cli/command-objects/floating-ip-pool.rst
+++ b/doc/source/cli/command-objects/floating-ip-pool.rst
@@ -2,7 +2,7 @@
 floating ip pool
 ================
 
-Compute v2, Network v2
+Network v2
 
 floating ip pool list
 ---------------------
diff --git a/doc/source/cli/command-objects/floating-ip.rst b/doc/source/cli/command-objects/floating-ip.rst
index 749c32d6..d122ccbe 100644
--- a/doc/source/cli/command-objects/floating-ip.rst
+++ b/doc/source/cli/command-objects/floating-ip.rst
@@ -2,7 +2,7 @@
 floating ip
 ===========
 
-Compute v2, Network v2
+Network v2
 
 floating ip create
 ------------------
diff --git a/doc/source/cli/command-objects/ip-fixed.rst b/doc/source/cli/command-objects/ip-fixed.rst
deleted file mode 100644
index f5b11dc6..00000000
--- a/doc/source/cli/command-objects/ip-fixed.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-========
-ip fixed
-========
-
-Compute v2
-
-ip fixed add
-------------
-
-Add fixed IP address to server
-(Deprecated, please use ``server add fixed ip`` instead)
-
-.. program:: ip fixed add
-.. code:: bash
-
-    openstack ip fixed add
-        <network>
-        <server>
-
-.. describe:: <network>
-
-    Network to fetch an IP address from (name or ID)
-
-.. describe:: <server>
-
-    Server to receive the IP address (name or ID)
-
-ip fixed remove
----------------
-
-Remove fixed IP address from server
-(Deprecated, please use ``server remove fixed ip`` instead)
-
-.. program:: ip fixed remove
-.. code:: bash
-
-    openstack ip fixed remove
-        <ip-address>
-        <server>
-
-.. describe:: <ip-address>
-
-    IP address to remove from server (name only)
-
-.. describe:: <server>
-
-    Server to remove the IP address from (name or ID)
diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst
index e302fdad..7c38aa5b 100644
--- a/doc/source/cli/commands.rst
+++ b/doc/source/cli/commands.rst
@@ -95,9 +95,9 @@ referring to both Compute and Volume quotas.
 * ``extension``: (**Compute**, **Identity**, **Network**, **Volume**) OpenStack server API extensions
 * ``federation protocol``: (**Identity**) the underlying protocol used while federating identities
 * ``flavor``: (**Compute**) predefined server configurations: ram, root disk and so on
-* ``fixed ip``: (**Compute**, **Network**) - an internal IP address assigned to a server
-* ``floating ip``: (**Compute**, **Network**) - a public IP address that can be mapped to a server
-* ``floating ip pool``: (**Compute**, **Network**) - a pool of public IP addresses
+* ``fixed ip``: (**Compute**) - an internal IP address assigned to a server
+* ``floating ip``: (**Network**) - a public IP address that can be mapped to a server
+* ``floating ip pool``: (**Network**) - a pool of public IP addresses
 * ``group``: (**Identity**) a grouping of users
 * ``host``: (**Compute**) - the physical computer running compute services
 * ``hypervisor``: (**Compute**) the virtual machine manager
@@ -106,9 +106,6 @@ referring to both Compute and Volume quotas.
 * ``image``: (**Image**) a disk image
 * ``image member``: (**Image**) a project that is a member of an Image
 * ``ip availability``: (**Network**) - details of IP usage of a network
-* ``ip fixed``: (**Compute**, **Network**) - an internal IP address assigned to a server
-* ``ip floating``: (**Compute**, **Network**) - a public IP address that can be mapped to a server
-* ``ip floating pool``: (**Compute**, **Network**) - a pool of public IP addresses
 * ``keypair``: (**Compute**) an SSH public key
 * ``limits``: (**Compute**, **Volume**) resource usage limits
 * ``mapping``: (**Identity**) a definition to translate identity provider attributes to Identity concepts