diff --git a/ansible/site.yml b/ansible/site.yml
index 3a60afd72fb256e48f360a40f477415a186c8b48..91b9ab44b7df324ea693214a32657419e9db4979 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -494,3 +494,7 @@
     - octavia-housekeeping
     - octavia-worker
   serial: '{{ serial|default("0") }}'
+  roles:
+    - { role: octavia,
+        tags: octavia,
+        when: enable_octavia | bool }
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 5d150f4384bc9e4013e4a0696dfc50b497be10d7..51397d6bad8e4409595d8f6f82562b4d13a0719b 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -149,6 +149,7 @@ kolla_internal_vip_address: "10.10.10.254"
 #enable_neutron_qos: "no"
 #enable_neutron_agent_ha: "no"
 #enable_neutron_vpnaas: "no"
+#enable_octavia: "no"
 #enable_rally: "no"
 #enable_sahara: "no"
 #enable_searchlight: "no"