diff --git a/metadata/service/client/init.yml b/metadata/service/client/init.yml
new file mode 100644
index 0000000..afd94ed
--- /dev/null
+++ b/metadata/service/client/init.yml
@@ -0,0 +1,6 @@
+applications:
+  - octavia
+parameters:
+  octavia:
+    client:
+      enabled: true
\ No newline at end of file
diff --git a/octavia/client.sls b/octavia/client.sls
new file mode 100644
index 0000000..47e6193
--- /dev/null
+++ b/octavia/client.sls
@@ -0,0 +1,8 @@
+{%- from "octavia/map.jinja" import client with context %}
+{%- if client.enabled %}
+
+octavia_client_packages:
+  pkg.installed:
+  - names: {{ client.pkgs }}
+
+{%- endif %}
\ No newline at end of file
diff --git a/octavia/init.sls b/octavia/init.sls
index 60080f9..f4401c5 100644
--- a/octavia/init.sls
+++ b/octavia/init.sls
@@ -5,3 +5,6 @@
 {%- if pillar.octavia.manager is defined %}
 - octavia.manager
 {%- endif %}
+{% if pillar.octavia.client is defined %}
+- octavia.client
+{% endif %}
diff --git a/octavia/map.jinja b/octavia/map.jinja
index 3280dc4..6d72326 100644
--- a/octavia/map.jinja
+++ b/octavia/map.jinja
@@ -53,3 +53,12 @@
         'error_log_rate': 0.2,
     },
 }, merge=pillar.octavia.get('monitoring', {})) %}
+
+{% set client = salt['grains.filter_by']({
+    'Debian': {
+        'pkgs': ['python-octaviaclient']
+    },
+    'RedHat': {
+        'pkgs': ['python-octaviaclient']
+    },
+}, merge=pillar.octavia.get('client', {})) %}