diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 0727b99ec..ecd6b07f9 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -651,6 +651,10 @@ if str2bool(hiera('enable_cinder', true)) {
   }
 }
 
+if str2bool(hiera('enable_octavia', false)) {
+  include ::octavia::client
+}
+
 # firewalld is a dependency of some anaconda packages, so we need to use purge
 # to ensure all the things that it might be a dependency for are also
 # removed. See LP#1669915
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index d762661c4..bf2041b16 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -849,6 +849,7 @@ enable_telemetry: {{ENABLE_TELEMETRY}}
 enable_ui: {{ENABLE_UI}}
 enable_cinder: {{ENABLE_CINDER}}
 enable_container_images_build: {{ENABLE_CONTAINER_IMAGES_BUILD}}
+enable_octavia: {{ENABLE_OCTAVIA}}
 
 # Path to install configuration files
 tripleo_install_user: {{TRIPLEO_INSTALL_USER}}
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index 750fa4bc2..07a9939b8 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -357,6 +357,11 @@ _opts = [
                 help=('Whether to enable docker container images to be build '
                       'on the undercloud.')
                 ),
+    cfg.BoolOpt('enable_octavia',
+                default=False,
+                help=('Whether to install the Octavia client in the '
+                      'Undercloud.')
+                ),
     cfg.StrOpt('ipa_otp',
                default='',
                help=('One Time Password to register Undercloud node with '
diff --git a/releasenotes/notes/add-octavia-client-63a82f5f54f631fa.yaml b/releasenotes/notes/add-octavia-client-63a82f5f54f631fa.yaml
new file mode 100644
index 000000000..534c914a6
--- /dev/null
+++ b/releasenotes/notes/add-octavia-client-63a82f5f54f631fa.yaml
@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Allow installation of the Octavia client in the Undercloud by setting new
+    option ``enable_octavia=True`` in the ``undercloud.conf``. Default is not
+    to enable.
diff --git a/undercloud.conf.sample b/undercloud.conf.sample
index 9e293b31a..e6de248c4 100644
--- a/undercloud.conf.sample
+++ b/undercloud.conf.sample
@@ -192,6 +192,9 @@
 # undercloud. (boolean value)
 #enable_container_images_build = true
 
+# Whether to install the Octavia client. (boolean value)
+#enable_octavia = false
+
 # One Time Password to register Undercloud node with an IPA server.
 # Required when enable_novajoin = True. (string value)
 #ipa_otp =