Merge "Transfer "ip fixed add/remove" to "server add/remove fixed ip""

2 files changed, 42 insertions, 0 deletions

diff --git a/doc/source/command-objects/ip-fixed.rst b/doc/source/command-objects/ip-fixed.rst
index 3a55b995..c2447b28 100644
--- a/doc/source/command-objects/ip-fixed.rst
+++ b/doc/source/command-objects/ip-fixed.rst
@@ -8,6 +8,7 @@ ip fixed add
 ------------
 
 Add fixed IP address to server
+(Deprecated, please use ``server add fixed ip`` instead)
 
 .. program:: ip fixed add
 .. code:: bash
@@ -28,6 +29,7 @@ ip fixed remove
 ---------------
 
 Remove fixed IP address from server
+(Deprecated, please use ``server remove fixed ip`` instead)
 
 .. program:: ip fixed remove
 .. code:: bash
diff --git a/doc/source/command-objects/server.rst b/doc/source/command-objects/server.rst
index 3393e7fb..49a54153 100644
--- a/doc/source/command-objects/server.rst
+++ b/doc/source/command-objects/server.rst
@@ -4,6 +4,26 @@ server
 
 Compute v2
 
+server add fixed ip
+-------------------
+
+Add fixed IP address to server
+
+.. program:: server add fixed ip
+.. code:: bash
+
+    os server add fixed ip
+        <server>
+        <network>
+
+.. describe:: <server>
+
+    Server (name or ID) to receive the fixed IP address
+
+.. describe:: <network>
+
+    Network (name or ID) to allocate the fixed IP address from
+
 server add floating ip
 ----------------------
 
@@ -438,6 +458,26 @@ Rebuild server
 
     Server (name or ID)
 
+server remove fixed ip
+----------------------
+
+Remove fixed IP address from server
+
+.. program:: server remove fixed ip
+.. code:: bash
+
+    os server remove fixed ip
+        <server>
+        <ip-address>
+
+.. describe:: <server>
+
+    Server (name or ID) to remove the fixed IP address from
+
+.. describe:: <ip-address>
+
+    Fixed IP address (IP address only) to remove from the server
+
 server remove floating ip
 -------------------------