Remove Ansible from Kolla

Change-Id: I5396e4b9927d3e65b6aa4185238a43a4765a996b

4 files changed, 0 insertions, 711 deletions

diff --git a/ansible/roles/haproxy/templates/haproxy.cfg.j2 b/ansible/roles/haproxy/templates/haproxy.cfg.j2
deleted file mode 100644
index 23244582d..000000000
--- a/ansible/roles/haproxy/templates/haproxy.cfg.j2
+++ /dev/null
@@ -1,649 +0,0 @@
-{% set tls_bind_info = 'ssl crt /etc/haproxy/haproxy.pem' if kolla_enable_tls_external | bool else '' %}
-global
-  chroot /var/lib/haproxy
-  user haproxy
-  group haproxy
-  daemon
-  log /var/lib/kolla/heka/log local0
-  maxconn 4000
-  stats socket /var/lib/kolla/haproxy/haproxy.sock
-{% if kolla_enable_tls_external | bool %}
-  ssl-default-bind-ciphers DEFAULT:!MEDIUM:!3DES
-  ssl-default-bind-options no-sslv3 no-tlsv10
-  tune.ssl.default-dh-param 4096
-{% endif %}
-
-defaults
-  log global
-  mode http
-  option redispatch
-  option httplog
-  option forwardfor
-  retries 3
-  timeout http-request 10s
-  timeout queue 1m
-  timeout connect 10s
-  timeout client 1m
-  timeout server 1m
-  timeout check 10s
-
-listen stats
-   bind {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ haproxy_stats_port }}
-   mode http
-   stats enable
-   stats uri /
-   stats refresh 15s
-   stats realm Haproxy\ Stats
-   stats auth {{ haproxy_user }}:{{ haproxy_password }}
-
-{% if enable_rabbitmq | bool %}
-listen rabbitmq_management
-  bind {{ kolla_internal_vip_address }}:{{ rabbitmq_management_port }}
-{% for host in groups['rabbitmq'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_management_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-
-{% if enable_mongodb | bool %}
-listen mongodb
-  bind {{ kolla_internal_vip_address }}:{{ mongodb_port }}
-{% for host in groups['mongodb'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ mongodb_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-
-{% if enable_keystone | bool %}
-listen keystone_internal
-  bind {{ kolla_internal_vip_address }}:{{ keystone_public_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['keystone'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ keystone_public_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen keystone_external
-  bind {{ kolla_external_vip_address }}:{{ keystone_public_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['keystone'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ keystone_public_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-
-listen keystone_admin
-  bind {{ kolla_internal_vip_address }}:{{ keystone_admin_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['keystone'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ keystone_admin_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-
-{% if enable_glance | bool %}
-listen glance_registry
-  bind {{ kolla_internal_vip_address }}:{{ glance_registry_port }}
-{% for host in groups['glance-registry'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_registry_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-listen glance_api
-  bind {{ kolla_internal_vip_address }}:{{ glance_api_port }}
-{% for host in groups['glance-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen glance_api_external
-  bind {{ kolla_external_vip_address }}:{{ glance_api_port }} {{ tls_bind_info }}
-{% for host in groups['glance-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ glance_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_nova | bool %}
-listen nova_api
-  bind {{ kolla_internal_vip_address }}:{{ nova_api_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['nova-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-listen nova_metadata
-  bind {{ kolla_internal_vip_address }}:{{ nova_metadata_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['nova-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_metadata_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-{% if nova_console == 'novnc' %}
-listen nova_novncproxy
-  bind {{ kolla_internal_vip_address }}:{{ nova_novncproxy_port }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['nova-novncproxy'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_novncproxy_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% elif nova_console == 'spice' %}
-listen nova_spicehtml5proxy
-  bind {{ kolla_internal_vip_address }}:{{ nova_spicehtml5proxy_port }}
-{% for host in groups['nova-spicehtml5proxy'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_spicehtml5proxy_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen nova_api_external
-  bind {{ kolla_external_vip_address }}:{{ nova_api_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['nova-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-listen nova_metadata_external
-  bind {{ kolla_external_vip_address }}:{{ nova_metadata_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['nova-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_metadata_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-{% if nova_console == 'novnc' %}
-listen nova_novncproxy_external
-  bind {{ kolla_external_vip_address }}:{{ nova_novncproxy_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['nova-novncproxy'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_novncproxy_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% elif nova_console == 'spice' %}
-listen nova_spicehtml5proxy_external
-  bind {{ kolla_external_vip_address }}:{{ nova_spicehtml5proxy_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['nova-spicehtml5proxy'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ nova_spicehtml5proxy_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-{% endif %}
-
-{% if enable_neutron | bool %}
-listen neutron_server
-  bind {{ kolla_internal_vip_address }}:{{ neutron_server_port }}
-{% for host in groups['neutron-server'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ neutron_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen neutron_server_external
-  bind {{ kolla_external_vip_address }}:{{ neutron_server_port }} {{ tls_bind_info }}
-{% for host in groups['neutron-server'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ neutron_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_horizon | bool %}
-listen horizon
-  bind {{ kolla_internal_vip_address }}:80
-  balance source
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['horizon'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:80 check inter 2000 rise 2 fall 5
-{% endfor %}
-
-{% if haproxy_enable_external_vip | bool %}
-{% if kolla_enable_tls_external | bool %}
-listen horizon_external
-  bind {{ kolla_external_vip_address }}:443 {{ tls_bind_info }}
-  balance source
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['horizon'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:80 check inter 2000 rise 2 fall 5
-{% endfor %}
-
-frontend horizon_external_redirect
-   bind {{ kolla_external_vip_address }}:80
-   redirect scheme https code 301 if !{ ssl_fc }
-{% else %}
-listen horizon_external
-  bind {{ kolla_external_vip_address }}:80
-{% for host in groups['horizon'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:80 check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-{% endif %}
-
-{% if enable_cinder | bool %}
-listen cinder_api
-  bind {{ kolla_internal_vip_address }}:{{ cinder_api_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['cinder-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ cinder_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen cinder_api_external
-  bind {{ kolla_external_vip_address }}:{{ cinder_api_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['cinder-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ cinder_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_cloudkitty | bool %}
-listen cloudkitty_api
-  bind {{ kolla_internal_vip_address }}:{{ cloudkitty_api_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['cloudkitty-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ cloudkitty_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen cloudkitty_api_external
-  bind {{ kolla_external_vip_address }}:{{ cloudkitty_api_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['cloudkitty-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ cloudkitty_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_heat | bool %}
-listen heat_api
-  bind {{ kolla_internal_vip_address }}:{{ heat_api_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['heat-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ heat_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-listen heat_api_cfn
-  bind {{ kolla_internal_vip_address }}:{{ heat_api_cfn_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['heat-api-cfn'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ heat_api_cfn_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen heat_api_external
-  bind {{ kolla_external_vip_address }}:{{ heat_api_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['heat-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ heat_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-
-listen heat_api_cfn_external
-  bind {{ kolla_external_vip_address }}:{{ heat_api_cfn_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['heat-api-cfn'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ heat_api_cfn_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_grafana | bool %}
-listen grafana_server
-  bind {{ kolla_internal_vip_address }}:{{ grafana_server_port }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['grafana'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ grafana_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen grafana_server_external
-  bind {{ kolla_external_vip_address }}:{{ grafana_server_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['grafana'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ grafana_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_ironic | bool %}
-listen ironic_api
-  bind {{ kolla_internal_vip_address }}:{{ ironic_api_port }}
-{% for host in groups['ironic-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ironic_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen ironic_api_external
-  bind {{ kolla_external_vip_address }}:{{ ironic_api_port }} {{ tls_bind_info }}
-{% for host in groups['ironic-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ironic_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_senlin | bool %}
-listen senlin_api
-  bind {{ kolla_internal_vip_address }}:{{ senlin_api_port }}
-{% for host in groups['senlin-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ senlin_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen senlin_api_external
-  bind {{ kolla_external_vip_address }}:{{ senlin_api_port }} {{ tls_bind_info }}
-{% for host in groups['senlin-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ senlin_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_swift | bool %}
-listen swift_api
-  bind {{ kolla_internal_vip_address }}:{{ swift_proxy_server_port }}
-{% for host in groups['swift-proxy-server'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ swift_proxy_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen swift_api_external
-  bind {{ kolla_external_vip_address }}:{{ swift_proxy_server_port }} {{ tls_bind_info }}
-{% for host in groups['swift-proxy-server'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ swift_proxy_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_murano | bool %}
-listen murano_api
-  bind {{ kolla_internal_vip_address }}:{{ murano_api_port }}
-{% for host in groups['murano-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ murano_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen murano_api_external
-  bind {{ kolla_external_vip_address }}:{{ murano_api_port }} {{ tls_bind_info }}
-{% for host in groups['murano-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ murano_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_manila | bool %}
-listen manila_api
-  bind {{ kolla_internal_vip_address }}:{{ manila_api_port }}
-{% for host in groups['manila-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ manila_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen manila_api_external
-  bind {{ kolla_external_vip_address }}:{{ manila_api_port }} {{ tls_bind_info }}
-{% for host in groups['manila-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ manila_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_magnum | bool %}
-listen magnum_api
-  bind {{ kolla_internal_vip_address }}:{{ magnum_api_port }}
-{% for host in groups['magnum-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ magnum_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen magnum_api_external
-  bind {{ kolla_external_vip_address }}:{{ magnum_api_port }} {{ tls_bind_info }}
-{% for host in groups['magnum-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ magnum_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_watcher | bool and enable_ceilometer | bool %}
-listen watcher_api
-  bind {{ kolla_internal_vip_address }}:{{ watcher_api_port }}
-{% for host in groups['watcher-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ watcher_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen watcher_api_external
-  bind {{ kolla_external_vip_address }}:{{ watcher_api_port }} {{ tls_bind_info }}
-{% for host in groups['watcher-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ watcher_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_sahara | bool %}
-listen sahara_api
-  bind {{ kolla_internal_vip_address }}:{{ sahara_api_port }}
-{% for host in groups['sahara-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ sahara_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen sahara_api_external
-  bind {{ kolla_external_vip_address }}:{{ sahara_api_port }} {{ tls_bind_info }}
-{% for host in groups['sahara-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ sahara_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_searchlight | bool %}
-listen searchlight_api
-  bind {{ kolla_internal_vip_address }}:{{ searchlight_api_port }}
-{% for host in groups['searchlight-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ searchlight_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen searchlight_api_external
-  bind {{ kolla_external_vip_address }}:{{ searchlight_api_port }} {{ tls_bind_info }}
-{% for host in groups['searchlight-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ searchlight_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_ceph | bool and enable_ceph_rgw | bool %}
-listen radosgw
-  bind {{ kolla_internal_vip_address }}:{{ rgw_port }}
-{% for host in groups['ceph-rgw'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rgw_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen radosgw_external
-  bind {{ kolla_external_vip_address }}:{{ rgw_port }} {{ tls_bind_info }}
-{% for host in groups['ceph-rgw'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rgw_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_kibana | bool %}
-
-userlist kibanauser
-  user {{ kibana_user }} insecure-password {{ kibana_password }}
-
-listen kibana
-  bind {{ kolla_internal_vip_address }}:{{ kibana_server_port }}
-  acl auth_acl http_auth(kibanauser)
-  http-request auth realm basicauth unless auth_acl
-{% for host in groups['kibana'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kibana_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen kibana_external
-  bind {{ kolla_external_vip_address }}:{{ kibana_server_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-  acl auth_acl http_auth(kibanauser)
-  http-request auth realm basicauth unless auth_acl
-{% for host in groups['kibana'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ kibana_server_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_gnocchi | bool %}
-listen gnocchi_api
-  bind {{ kolla_internal_vip_address }}:{{ gnocchi_api_port }}
-{% for host in groups['gnocchi-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ gnocchi_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen gnocchi_api_external
-  bind {{ kolla_external_vip_address }}:{{ gnocchi_api_port }} {{ tls_bind_info }}
-{% for host in groups['gnocchi-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ gnocchi_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_elasticsearch | bool %}
-listen elasticsearch
-  option dontlog-normal
-  bind {{ kolla_internal_vip_address }}:{{ elasticsearch_port }}
-{% for host in groups['elasticsearch'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ elasticsearch_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-
-{% if enable_barbican | bool %}
-listen barbican_api
-  bind {{ kolla_internal_vip_address }}:{{ barbican_api_port }}
-{% for host in groups['barbican-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ barbican_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen barbican_api_external
-  bind {{ kolla_external_vip_address }}:{{ barbican_api_port }} {{ tls_bind_info }}
-{% for host in groups['barbican-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ barbican_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_ceilometer | bool %}
-listen ceilometer_api
-  bind {{ kolla_internal_vip_address }}:{{ ceilometer_api_port }}
-{% for host in groups['ceilometer-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ceilometer_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen ceilometer_api_external
-  bind {{ kolla_external_vip_address }}:{{ ceilometer_api_port }} {{ tls_bind_info }}
-{% for host in groups['ceilometer-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ ceilometer_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_aodh | bool %}
-listen aodh_api
-  bind {{ kolla_internal_vip_address }}:{{ aodh_api_port }}
-{% for host in groups['aodh-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ aodh_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen aodh_api_external
-  bind {{ kolla_external_vip_address }}:{{ aodh_api_port }} {{ tls_bind_info }}
-{% for host in groups['aodh-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ aodh_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_congress | bool %}
-listen congress_api
-  bind {{ kolla_internal_vip_address }}:{{ congress_api_port }}
-  http-request del-header X-Forwarded-Proto
-{% for host in groups['congress-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ congress_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen congress_api_external
-  bind {{ kolla_external_vip_address }}:{{ congress_api_port }} {{ tls_bind_info }}
-  http-request del-header X-Forwarded-Proto
-  http-request set-header X-Forwarded-Proto https if { ssl_fc }
-{% for host in groups['congress-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ congress_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_designate | bool %}
-listen designate_api
-  bind {{ kolla_internal_vip_address }}:{{ designate_api_port }}
-{% for host in groups['designate-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ designate_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen designate_api_external
-  bind {{ kolla_external_vip_address }}:{{ designate_api_port }} {{ tls_bind_info }}
-{% for host in groups['designate-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ designate_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-{% if enable_mistral | bool %}
-listen mistral_api
-  bind {{ kolla_internal_vip_address }}:{{ mistral_api_port }}
-{% for host in groups['mistral-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ mistral_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% if haproxy_enable_external_vip | bool %}
-
-listen mistral_api_external
-  bind {{ kolla_external_vip_address }}:{{ mistral_api_port }} {{ tls_bind_info }}
-{% for host in groups['mistral-api'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ mistral_api_port }} check inter 2000 rise 2 fall 5
-{% endfor %}
-{% endif %}
-{% endif %}
-
-# (NOTE): This defaults section deletes forwardfor as recommended by:
-#         https://marc.info/?l=haproxy&m=141684110710132&w=1
-
-defaults
-  log global
-  mode http
-  option redispatch
-  option httplog
-  retries 3
-  timeout http-request 10s
-  timeout queue 1m
-  timeout connect 10s
-  timeout client 1m
-  timeout server 1m
-  timeout check 10s
-
-{% if enable_mariadb | bool %}
-listen mariadb
-  mode tcp
-  option tcplog
-  option tcpka
-  option mysql-check user haproxy post-41
-  bind {{ kolla_internal_vip_address }}:{{ mariadb_port }}
-{% for host in groups['mariadb'] %}
-  server {{ hostvars[host]['ansible_hostname'] }} {{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ mariadb_port }} check inter 2000 rise 2 fall 5 {% if not loop.first %}backup{% endif %}
-
-{% endfor %}
-{% endif %}
diff --git a/ansible/roles/haproxy/templates/haproxy.json.j2 b/ansible/roles/haproxy/templates/haproxy.json.j2
deleted file mode 100644
index c95dd7703..000000000
--- a/ansible/roles/haproxy/templates/haproxy.json.j2
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "command": "/usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/haproxy.cfg",
-            "dest": "/etc/haproxy/haproxy.cfg",
-            "owner": "root",
-            "perm": "0644"
-        },
-        {
-            "source": "{{ container_config_directory }}/haproxy.pem",
-            "dest": "/etc/haproxy/haproxy.pem",
-            "owner": "root",
-            "perm": "0600",
-            "optional": {{ (not kolla_enable_tls_external | bool) | string | lower }}
-        }
-    ]
-}
diff --git a/ansible/roles/haproxy/templates/keepalived.conf.j2 b/ansible/roles/haproxy/templates/keepalived.conf.j2
deleted file mode 100644
index 8307a2f50..000000000
--- a/ansible/roles/haproxy/templates/keepalived.conf.j2
+++ /dev/null
@@ -1,33 +0,0 @@
-vrrp_script check_alive {
-    script "/check_alive.sh"
-    interval 2
-    fall 2
-    rise 10
-}
-
-vrrp_instance kolla_internal_vip_{{ keepalived_virtual_router_id }} {
-    state BACKUP
-    nopreempt
-    interface {{ api_interface }}
-    virtual_router_id {{ keepalived_virtual_router_id }}
-    priority {{ groups['haproxy'].index(inventory_hostname) + 1 }}
-    advert_int 1
-    virtual_ipaddress {
-        {{ kolla_internal_vip_address }} dev {{  api_interface }}
-{% if haproxy_enable_external_vip | bool %}
-        {{ kolla_external_vip_address }} dev {{ kolla_external_vip_interface }}
-{% endif %}
-    }
-{% if haproxy_enable_external_vip | bool and api_interface != kolla_external_vip_interface %}
-    track_interface {
-        {{ kolla_external_vip_interface }}
-    }
-{% endif %}
-    authentication {
-        auth_type PASS
-        auth_pass {{ keepalived_password }}
-    }
-    track_script {
-        check_alive
-    }
-}
diff --git a/ansible/roles/haproxy/templates/keepalived.json.j2 b/ansible/roles/haproxy/templates/keepalived.json.j2
deleted file mode 100644
index 63a760c67..000000000
--- a/ansible/roles/haproxy/templates/keepalived.json.j2
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "command": "/usr/sbin/keepalived -nld -p /run/keepalived.pid",
-    "config_files": [
-        {
-            "source": "{{ container_config_directory }}/keepalived.conf",
-            "dest": "/etc/keepalived/keepalived.conf",
-            "owner": "root",
-            "perm": "0644"
-        }
-    ]
-}