diff --git a/ansible/roles/aodh/tasks/loadbalancer.yml b/ansible/roles/aodh/tasks/loadbalancer.yml
index b66ad26c9f..edced5559c 100644
--- a/ansible/roles/aodh/tasks/loadbalancer.yml
+++ b/ansible/roles/aodh/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ aodh_services }}"
tags: always
diff --git a/ansible/roles/barbican/tasks/loadbalancer.yml b/ansible/roles/barbican/tasks/loadbalancer.yml
index 122b6beeea..78a7c1619c 100644
--- a/ansible/roles/barbican/tasks/loadbalancer.yml
+++ b/ansible/roles/barbican/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ barbican_services }}"
tags: always
diff --git a/ansible/roles/blazar/tasks/loadbalancer.yml b/ansible/roles/blazar/tasks/loadbalancer.yml
index a6560189c9..e1dcdc5c74 100644
--- a/ansible/roles/blazar/tasks/loadbalancer.yml
+++ b/ansible/roles/blazar/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ blazar_services }}"
tags: always
diff --git a/ansible/roles/ceph-rgw/tasks/loadbalancer.yml b/ansible/roles/ceph-rgw/tasks/loadbalancer.yml
index d29f3e56d1..86f2be9937 100644
--- a/ansible/roles/ceph-rgw/tasks/loadbalancer.yml
+++ b/ansible/roles/ceph-rgw/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- role: haproxy-config
+ role: loadbalancer-config
vars:
project_services: "{{ ceph_rgw_services }}"
tags: always
diff --git a/ansible/roles/cinder/tasks/loadbalancer.yml b/ansible/roles/cinder/tasks/loadbalancer.yml
index e8070be96d..b764a7a1c2 100644
--- a/ansible/roles/cinder/tasks/loadbalancer.yml
+++ b/ansible/roles/cinder/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ cinder_services }}"
tags: always
diff --git a/ansible/roles/cloudkitty/tasks/loadbalancer.yml b/ansible/roles/cloudkitty/tasks/loadbalancer.yml
index 5f3b9fc8b3..44483ca7c2 100644
--- a/ansible/roles/cloudkitty/tasks/loadbalancer.yml
+++ b/ansible/roles/cloudkitty/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ cloudkitty_services }}"
tags: always
diff --git a/ansible/roles/cyborg/tasks/loadbalancer.yml b/ansible/roles/cyborg/tasks/loadbalancer.yml
index 1d7b477870..43475021a5 100644
--- a/ansible/roles/cyborg/tasks/loadbalancer.yml
+++ b/ansible/roles/cyborg/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ cyborg_services }}"
tags: always
diff --git a/ansible/roles/designate/tasks/loadbalancer.yml b/ansible/roles/designate/tasks/loadbalancer.yml
index 6ddefc01ad..5c71deb353 100644
--- a/ansible/roles/designate/tasks/loadbalancer.yml
+++ b/ansible/roles/designate/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ designate_services }}"
tags: always
diff --git a/ansible/roles/elasticsearch/tasks/loadbalancer.yml b/ansible/roles/elasticsearch/tasks/loadbalancer.yml
index 02eab8afa0..e4a921891a 100644
--- a/ansible/roles/elasticsearch/tasks/loadbalancer.yml
+++ b/ansible/roles/elasticsearch/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ elasticsearch_services }}"
tags: always
diff --git a/ansible/roles/freezer/tasks/loadbalancer.yml b/ansible/roles/freezer/tasks/loadbalancer.yml
index dbe0cdb9bc..e8bcef064b 100644
--- a/ansible/roles/freezer/tasks/loadbalancer.yml
+++ b/ansible/roles/freezer/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ freezer_services }}"
tags: always
diff --git a/ansible/roles/glance/tasks/loadbalancer.yml b/ansible/roles/glance/tasks/loadbalancer.yml
index 36efea057c..4c8add36ac 100644
--- a/ansible/roles/glance/tasks/loadbalancer.yml
+++ b/ansible/roles/glance/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ glance_services }}"
tags: always
diff --git a/ansible/roles/gnocchi/tasks/loadbalancer.yml b/ansible/roles/gnocchi/tasks/loadbalancer.yml
index b77c440a4d..be4016020d 100644
--- a/ansible/roles/gnocchi/tasks/loadbalancer.yml
+++ b/ansible/roles/gnocchi/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ gnocchi_services }}"
tags: always
diff --git a/ansible/roles/grafana/tasks/loadbalancer.yml b/ansible/roles/grafana/tasks/loadbalancer.yml
index 0f61db2044..fb9dffd221 100644
--- a/ansible/roles/grafana/tasks/loadbalancer.yml
+++ b/ansible/roles/grafana/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ grafana_services }}"
tags: always
diff --git a/ansible/roles/heat/tasks/loadbalancer.yml b/ansible/roles/heat/tasks/loadbalancer.yml
index 020b523add..2c45e31deb 100644
--- a/ansible/roles/heat/tasks/loadbalancer.yml
+++ b/ansible/roles/heat/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ heat_services }}"
tags: always
diff --git a/ansible/roles/horizon/tasks/loadbalancer.yml b/ansible/roles/horizon/tasks/loadbalancer.yml
index da37990bdc..908fe3dba9 100644
--- a/ansible/roles/horizon/tasks/loadbalancer.yml
+++ b/ansible/roles/horizon/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ horizon_services }}"
tags: always
diff --git a/ansible/roles/influxdb/tasks/loadbalancer.yml b/ansible/roles/influxdb/tasks/loadbalancer.yml
index f4fd8cca3e..8ce5d27a9f 100644
--- a/ansible/roles/influxdb/tasks/loadbalancer.yml
+++ b/ansible/roles/influxdb/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ influxdb_services }}"
tags: always
diff --git a/ansible/roles/ironic/tasks/loadbalancer.yml b/ansible/roles/ironic/tasks/loadbalancer.yml
index b3a7155d12..6454ec172d 100644
--- a/ansible/roles/ironic/tasks/loadbalancer.yml
+++ b/ansible/roles/ironic/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ ironic_services }}"
tags: always
diff --git a/ansible/roles/keystone/tasks/loadbalancer.yml b/ansible/roles/keystone/tasks/loadbalancer.yml
index 954388aa90..ec0c78bf58 100644
--- a/ansible/roles/keystone/tasks/loadbalancer.yml
+++ b/ansible/roles/keystone/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ keystone_services }}"
tags: always
diff --git a/ansible/roles/kibana/tasks/loadbalancer.yml b/ansible/roles/kibana/tasks/loadbalancer.yml
index 9112f4f743..608ef559d0 100644
--- a/ansible/roles/kibana/tasks/loadbalancer.yml
+++ b/ansible/roles/kibana/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ kibana_services }}"
tags: always
diff --git a/ansible/roles/loadbalancer-config/defaults/main.yml b/ansible/roles/loadbalancer-config/defaults/main.yml
new file mode 100644
index 0000000000..75e4595fad
--- /dev/null
+++ b/ansible/roles/loadbalancer-config/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+haproxy_config_install: "{{ project_name != 'mariadb' or not enable_proxysql | bool }}"
diff --git a/ansible/roles/loadbalancer-config/tasks/main.yml b/ansible/roles/loadbalancer-config/tasks/main.yml
new file mode 100644
index 0000000000..3718c38ab4
--- /dev/null
+++ b/ansible/roles/loadbalancer-config/tasks/main.yml
@@ -0,0 +1,4 @@
+---
+- import_role:
+ name: haproxy-config
+ when: haproxy_config_install | bool
diff --git a/ansible/roles/magnum/tasks/loadbalancer.yml b/ansible/roles/magnum/tasks/loadbalancer.yml
index 9de5560e44..96e0ab7285 100644
--- a/ansible/roles/magnum/tasks/loadbalancer.yml
+++ b/ansible/roles/magnum/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ magnum_services }}"
tags: always
diff --git a/ansible/roles/manila/tasks/loadbalancer.yml b/ansible/roles/manila/tasks/loadbalancer.yml
index 91f201a186..270037d1db 100644
--- a/ansible/roles/manila/tasks/loadbalancer.yml
+++ b/ansible/roles/manila/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ manila_services }}"
tags: always
diff --git a/ansible/roles/mariadb/tasks/loadbalancer.yml b/ansible/roles/mariadb/tasks/loadbalancer.yml
index 6c9b4bdb40..8ea7c2d7d0 100644
--- a/ansible/roles/mariadb/tasks/loadbalancer.yml
+++ b/ansible/roles/mariadb/tasks/loadbalancer.yml
@@ -38,19 +38,9 @@
failed_when: False
run_once: True
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ mariadb_services }}"
tags: always
- when: not enable_proxysql | bool
-
-- name: "Configure proxysql for {{ project_name }}"
- import_role:
- name: proxysql-config
- vars:
- project: "mariadb"
- project_database_shard: "{{ mariadb_shards_info }}"
- tags: always
- when: enable_proxysql | bool
diff --git a/ansible/roles/masakari/tasks/loadbalancer.yml b/ansible/roles/masakari/tasks/loadbalancer.yml
index 0eed33fd06..8b07fdb758 100644
--- a/ansible/roles/masakari/tasks/loadbalancer.yml
+++ b/ansible/roles/masakari/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ masakari_services }}"
tags: always
diff --git a/ansible/roles/memcached/tasks/loadbalancer.yml b/ansible/roles/memcached/tasks/loadbalancer.yml
index 4ddf84710e..366828fdd5 100644
--- a/ansible/roles/memcached/tasks/loadbalancer.yml
+++ b/ansible/roles/memcached/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ memcached_services }}"
tags: always
diff --git a/ansible/roles/mistral/tasks/loadbalancer.yml b/ansible/roles/mistral/tasks/loadbalancer.yml
index 7a1c327cb3..b205259133 100644
--- a/ansible/roles/mistral/tasks/loadbalancer.yml
+++ b/ansible/roles/mistral/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ mistral_services }}"
tags: always
diff --git a/ansible/roles/monasca/tasks/loadbalancer.yml b/ansible/roles/monasca/tasks/loadbalancer.yml
index 1c8cd4b097..8eac15fe30 100644
--- a/ansible/roles/monasca/tasks/loadbalancer.yml
+++ b/ansible/roles/monasca/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ monasca_services }}"
tags: always
diff --git a/ansible/roles/murano/tasks/loadbalancer.yml b/ansible/roles/murano/tasks/loadbalancer.yml
index 8619ed9717..215d32c461 100644
--- a/ansible/roles/murano/tasks/loadbalancer.yml
+++ b/ansible/roles/murano/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ murano_services }}"
tags: always
diff --git a/ansible/roles/neutron/tasks/loadbalancer.yml b/ansible/roles/neutron/tasks/loadbalancer.yml
index 4ad32c259f..faf30f1c3c 100644
--- a/ansible/roles/neutron/tasks/loadbalancer.yml
+++ b/ansible/roles/neutron/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ neutron_services }}"
tags: always
diff --git a/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml b/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml
index 80c8f7cd0d..bcf95227b9 100644
--- a/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml
+++ b/ansible/roles/nova-cell/tasks/cell_proxy_loadbalancer.yml
@@ -1,7 +1,7 @@
---
# Configure HAProxy for one cell for a particular console proxy type.
- import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ cell_proxy_project_services | namespace_haproxy_for_cell(cell_name) }}"
# Default is necessary because this play may not be targetting the hosts in
diff --git a/ansible/roles/nova-cell/tasks/loadbalancer.yml b/ansible/roles/nova-cell/tasks/loadbalancer.yml
index 61c6d16d00..354fb7003a 100644
--- a/ansible/roles/nova-cell/tasks/loadbalancer.yml
+++ b/ansible/roles/nova-cell/tasks/loadbalancer.yml
@@ -9,7 +9,7 @@
# group membership as a guide. We'll take novncproxy as an example. We find the
# set of unique values of the 'nova_cell_novncproxy_group' variable for hosts
# in the global 'nova-novncproxy' group - there should be one for each cell.
-# Then for each of those groups, we run the haproxy-config role, using the
+# Then for each of those groups, we run the loadbalancer-config role, using the
# proxy configuration for a host in that group. This allows us to have
# different ports for each cell, and potentially a different console type
# (nova_console) also.
diff --git a/ansible/roles/nova-cell/tasks/proxy_loadbalancer.yml b/ansible/roles/nova-cell/tasks/proxy_loadbalancer.yml
index 72752f9465..fda251127e 100644
--- a/ansible/roles/nova-cell/tasks/proxy_loadbalancer.yml
+++ b/ansible/roles/nova-cell/tasks/proxy_loadbalancer.yml
@@ -2,14 +2,14 @@
# Configure HAProxy for all cells for a particular proxy type.
# Iterate over each cell group, creating HAProxy config for that cell.
-- name: "Configure HAProxy for {{ cell_proxy_service_name }}"
+- name: "Configure loadbalancer for {{ cell_proxy_service_name }}"
include_tasks: cell_proxy_loadbalancer.yml
vars:
# NOTE(mgoddard): Defining this here rather than in
# cell_proxy_loadbalancer.yml due to a weird issue seen on Ansible 2.8. If
# project_name is specified as a role variable for the import, it seems to
# get stuck and override the variable for subsequent imports of the
- # haproxy-config role for other services. By that point
+ # loadbalancer-config role for other services. By that point
# cell_proxy_service_name is no longer defined, so it fails.
project_name: "nova-cell:{{ cell_proxy_service_name }}"
with_items: "{{ cell_proxy_groups }}"
diff --git a/ansible/roles/nova/tasks/loadbalancer.yml b/ansible/roles/nova/tasks/loadbalancer.yml
index 21851745ae..e120820396 100644
--- a/ansible/roles/nova/tasks/loadbalancer.yml
+++ b/ansible/roles/nova/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ nova_services }}"
tags: always
diff --git a/ansible/roles/octavia/tasks/loadbalancer.yml b/ansible/roles/octavia/tasks/loadbalancer.yml
index 57eba01ccc..25d41d8356 100644
--- a/ansible/roles/octavia/tasks/loadbalancer.yml
+++ b/ansible/roles/octavia/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ octavia_services }}"
tags: always
diff --git a/ansible/roles/placement/tasks/loadbalancer.yml b/ansible/roles/placement/tasks/loadbalancer.yml
index 41c052cb16..ebe4aa49b0 100644
--- a/ansible/roles/placement/tasks/loadbalancer.yml
+++ b/ansible/roles/placement/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ placement_services }}"
tags: always
diff --git a/ansible/roles/prometheus/tasks/loadbalancer.yml b/ansible/roles/prometheus/tasks/loadbalancer.yml
index 794798f147..c65be7a89a 100644
--- a/ansible/roles/prometheus/tasks/loadbalancer.yml
+++ b/ansible/roles/prometheus/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ prometheus_services }}"
tags: always
diff --git a/ansible/roles/rabbitmq/tasks/loadbalancer.yml b/ansible/roles/rabbitmq/tasks/loadbalancer.yml
index 5841602634..eb935343d9 100644
--- a/ansible/roles/rabbitmq/tasks/loadbalancer.yml
+++ b/ansible/roles/rabbitmq/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ rabbitmq_services }}"
tags: always
diff --git a/ansible/roles/sahara/tasks/loadbalancer.yml b/ansible/roles/sahara/tasks/loadbalancer.yml
index 235c7b1df7..178ba1cafa 100644
--- a/ansible/roles/sahara/tasks/loadbalancer.yml
+++ b/ansible/roles/sahara/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ sahara_services }}"
tags: always
diff --git a/ansible/roles/senlin/tasks/loadbalancer.yml b/ansible/roles/senlin/tasks/loadbalancer.yml
index 7fed6aa11e..ea92b24be6 100644
--- a/ansible/roles/senlin/tasks/loadbalancer.yml
+++ b/ansible/roles/senlin/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ senlin_services }}"
tags: always
diff --git a/ansible/roles/skydive/tasks/loadbalancer.yml b/ansible/roles/skydive/tasks/loadbalancer.yml
index a75d3ee3e4..0c51ccfdbc 100644
--- a/ansible/roles/skydive/tasks/loadbalancer.yml
+++ b/ansible/roles/skydive/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ skydive_services }}"
tags: always
diff --git a/ansible/roles/solum/tasks/loadbalancer.yml b/ansible/roles/solum/tasks/loadbalancer.yml
index 12c0538559..8881542192 100644
--- a/ansible/roles/solum/tasks/loadbalancer.yml
+++ b/ansible/roles/solum/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ solum_services }}"
tags: always
diff --git a/ansible/roles/swift/tasks/loadbalancer.yml b/ansible/roles/swift/tasks/loadbalancer.yml
index f5e6b15f87..0425c6ad3a 100644
--- a/ansible/roles/swift/tasks/loadbalancer.yml
+++ b/ansible/roles/swift/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ swift_services }}"
tags: always
diff --git a/ansible/roles/tacker/tasks/loadbalancer.yml b/ansible/roles/tacker/tasks/loadbalancer.yml
index 13e3f79479..d7abe79089 100644
--- a/ansible/roles/tacker/tasks/loadbalancer.yml
+++ b/ansible/roles/tacker/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ tacker_services }}"
tags: always
diff --git a/ansible/roles/trove/tasks/loadbalancer.yml b/ansible/roles/trove/tasks/loadbalancer.yml
index 7a8c3ed28e..ef8db402b8 100644
--- a/ansible/roles/trove/tasks/loadbalancer.yml
+++ b/ansible/roles/trove/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ trove_services }}"
tags: always
diff --git a/ansible/roles/venus/tasks/loadbalancer.yml b/ansible/roles/venus/tasks/loadbalancer.yml
index 747b8623de..b692351e63 100644
--- a/ansible/roles/venus/tasks/loadbalancer.yml
+++ b/ansible/roles/venus/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ venus_services }}"
tags: always
diff --git a/ansible/roles/vitrage/tasks/loadbalancer.yml b/ansible/roles/vitrage/tasks/loadbalancer.yml
index 28696ca39b..4fba573d24 100644
--- a/ansible/roles/vitrage/tasks/loadbalancer.yml
+++ b/ansible/roles/vitrage/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ vitrage_services }}"
tags: always
diff --git a/ansible/roles/watcher/tasks/loadbalancer.yml b/ansible/roles/watcher/tasks/loadbalancer.yml
index ecce5ad2f5..ffdb8dfa48 100644
--- a/ansible/roles/watcher/tasks/loadbalancer.yml
+++ b/ansible/roles/watcher/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ watcher_services }}"
tags: always
diff --git a/ansible/roles/zun/tasks/loadbalancer.yml b/ansible/roles/zun/tasks/loadbalancer.yml
index a5880a700a..95390ced5c 100644
--- a/ansible/roles/zun/tasks/loadbalancer.yml
+++ b/ansible/roles/zun/tasks/loadbalancer.yml
@@ -1,7 +1,7 @@
---
-- name: "Configure haproxy for {{ project_name }}"
+- name: "Configure loadbalancer for {{ project_name }}"
import_role:
- name: haproxy-config
+ name: loadbalancer-config
vars:
project_services: "{{ zun_services }}"
tags: always
diff --git a/kolla_ansible/nova_filters.py b/kolla_ansible/nova_filters.py
index fc2be76f45..3a613cf3ea 100644
--- a/kolla_ansible/nova_filters.py
+++ b/kolla_ansible/nova_filters.py
@@ -71,7 +71,7 @@ def namespace_haproxy_for_cell(services, cell_name):
# name.
return "{}_{}".format(name, cell_name) if cell_name else name
- # Service name must be namespaced as haproxy-config uses this as the
+ # Service name must be namespaced as loadbalancer-config uses this as the
# config file name.
services = {
_namespace(service_name): service