diff --git a/ansible/kolla.yml b/ansible/kolla.yml
index 69423e1b0..10209f0c0 100644
--- a/ansible/kolla.yml
+++ b/ansible/kolla.yml
@@ -20,10 +20,10 @@
     - role: kolla-build
 
     - role: kolla-ansible
-      kolla_internal_vip_address: "{{ internal_net_name | net_vip_address }}"
-      kolla_internal_fqdn: "{{ internal_net_name | net_fqdn or kolla_internal_vip_address }}"
-      kolla_external_vip_address: "{{ external_net_name | net_vip_address }}"
-      kolla_external_fqdn: "{{ external_net_name | net_fqdn or kolla_external_vip_address }}"
+      kolla_internal_vip_address: "{% if kolla_enable_haproxy | bool %}{{ internal_net_name | net_vip_address }}{% elif controller_host %}{{ internal_net_name | net_ip(controller_host) }}{% endif %}"
+      kolla_internal_fqdn: "{% if kolla_enable_haproxy | bool %}{{ internal_net_name | net_fqdn or kolla_internal_vip_address }}{% elif controller_host %}{{ internal_net_name | net_ip(controller_host) }}{% endif %}"
+      kolla_external_vip_address: "{% if kolla_enable_haproxy | bool %}{{ external_net_name | net_vip_address }}{% elif controller_host %}{{ external_net_name | net_ip(controller_host) }}{% endif %}"
+      kolla_external_fqdn: "{% if kolla_enable_haproxy | bool %}{{ external_net_name | net_fqdn or kolla_external_vip_address }}{% elif controller_host %}{{ external_net_name | net_ip(controller_host) }}{% endif %}"
       kolla_network_interface: "{% if controller_host %}{{ internal_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"
       kolla_external_vip_interface: "{% if controller_host %}{{ external_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"
       kolla_api_interface: "{% if controller_host %}{{ internal_net_name | net_interface(controller_host) | replace('-', '_') }}{% endif %}"
diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml
index adee68bbe..85f81741a 100644
--- a/ansible/roles/kolla-ansible/vars/main.yml
+++ b/ansible/roles/kolla-ansible/vars/main.yml
@@ -17,6 +17,7 @@ kolla_feature_flags:
   - etcd
   - gnocchi
   - grafana
+  - haproxy
   - heat
   - horizon
   - influxdb
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 99b1a32f3..43bed55b6 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -56,6 +56,7 @@
 #kolla_enable_etcd:
 #kolla_enable_gnocchi:
 #kolla_enable_grafana:
+#kolla_enable_haproxy:
 #kolla_enable_heat:
 #kolla_enable_horizon:
 #kolla_enable_influxdb: