diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst
index 5c50a1bf..2a05d5c9 100644
--- a/doc/source/cli/commands.rst
+++ b/doc/source/cli/commands.rst
@@ -195,6 +195,13 @@ conflicts when creating new plugins. For a complete list check out
 * ``dataprocessing image tags``: (**Data Processing (Sahara)**)
 * ``dataprocessing plugin``: (**Data Processing (Sahara)**)
 * ``data protection plan``: (**Data Protection (Karbor)**)
+* ``loadbalancer``: (**Load Balancer (Octavia)**)
+* ``loadbalancer healthmonitor``: (**Load Balancer (Octavia)**)
+* ``loadbalancer l7policy``: (**Load Balancer (Octavia)**)
+* ``loadbalancer l7rule``: (**Load Balancer (Octavia)**)
+* ``loadbalancer listener``: (**Load Balancer (Octavia)**)
+* ``loadbalancer member``: (**Load Balancer (Octavia)**)
+* ``loadbalancer pool``: (**Load Balancer (Octavia)**)
 * ``message-broker cluster``: (**Message Broker (Cue)**)
 * ``messaging``: (**Messaging (Zaqar)**)
 * ``messaging flavor``: (**Messaging (Zaqar)**)
diff --git a/doc/source/cli/plugin-commands.rst b/doc/source/cli/plugin-commands.rst
index 55984ffb..34efdc3d 100644
--- a/doc/source/cli/plugin-commands.rst
+++ b/doc/source/cli/plugin-commands.rst
@@ -81,6 +81,12 @@ neutron
 .. list-plugins:: openstack.neutronclient.v2
    :detailed:
 
+octavia
+-------
+
+.. list-plugins:: openstack.load_balancer.v2
+   :detailed:
+
 sahara
 ------
 
diff --git a/doc/source/contributor/plugins.rst b/doc/source/contributor/plugins.rst
index 13f5d495..fb21a079 100644
--- a/doc/source/contributor/plugins.rst
+++ b/doc/source/contributor/plugins.rst
@@ -35,6 +35,7 @@ The following is a list of projects that are an OpenStackClient plugin.
 - python-mistralclient
 - python-muranoclient
 - python-neutronclient\*\*\*
+- python-octaviaclient
 - python-saharaclient
 - python-searchlightclient
 - python-senlinclient
diff --git a/test-requirements.txt b/test-requirements.txt
index b6f3edb6..411dc877 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -35,6 +35,7 @@ python-karborclient>=0.2.0 # Apache-2.0
 python-mistralclient>=3.1.0 # Apache-2.0
 python-muranoclient>=0.8.2 # Apache-2.0
 python-neutronclient>=6.3.0 # Apache-2.0
+python-octaviaclient>=1.0.0 # Apache-2.0
 python-saharaclient>=1.1.0 # Apache-2.0
 python-searchlightclient>=1.0.0 #Apache-2.0
 python-senlinclient>=1.1.0 # Apache-2.0