Merge "Remove haproxy and keepalived groups"

0d142f93 · Zuul · Gerrit Code Review · 568a5598 · 9dd7ed03 · 0d142f93
Commit 0d142f93 authored 3 years ago by Zuul Committed by Gerrit Code Review 3 years ago
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -26,7 +26,7 @@ storage
 monitoring

 [chrony-server:children]
-haproxy
+loadbalancer

 [chrony:children]
 control
@@ -75,12 +75,6 @@ compute
 [loadbalancer:children]
 network

-[keepalived:children]
-loadbalancer
-
-[haproxy:children]
-loadbalancer
-
 [mariadb:children]
 control


--- a/ansible/roles/kolla-ansible/templates/overcloud-services.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-services.j2
@@ -502,7 +502,7 @@ storage
 mariadb

 [prometheus-haproxy-exporter:children]
-haproxy
+loadbalancer

 [prometheus-memcached-exporter:children]
 memcached