Merge "Respect haproxy_bind_internal_lb_vip_* variables"

inventory/group_vars/galera_all.yml

@@ -58,7 +58,11 @@ haproxy_galera_service:
   haproxy_service_name: galera
   haproxy_backend_nodes: "{{ (groups['galera_all'] | default([]))[:1] }}"  # list expected
   haproxy_backup_nodes: "{{ (groups['galera_all'] | default([]))[1:] }}"
-  haproxy_bind: "{{ [haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address)] }}"
+  haproxy_bind: >-
+    {{ [{
+          'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
+          'interface': haproxy_bind_internal_lb_vip_interface | default('')
+    }] }}
   haproxy_port: 3306
   haproxy_check_port: 9200
   haproxy_balance_type: tcp

inventory/group_vars/neutron_all/haproxy_service.yml

@@ -32,7 +32,11 @@ haproxy_neutron_server_service:
 haproxy_opendaylight_neutron_service:
   haproxy_service_name: opendaylight-neutron
   haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
-  haproxy_bind: "{{ [haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address)] }}"
+  haproxy_bind: >-
+    {{ [{
+          'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
+          'interface': haproxy_bind_internal_lb_vip_interface | default('')
+    }] }}
   haproxy_port: 8180
   haproxy_balance_type: tcp
   haproxy_timeout_client: 5000s
@@ -43,7 +47,11 @@ haproxy_opendaylight_neutron_service:
 haproxy_opendaylight_websocket_service:
   haproxy_service_name: opendaylight-websocket
   haproxy_backend_nodes: "{{ groups['neutron_server'] | default([]) }}"
-  haproxy_bind: "{{ [haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address)] }}"
+  haproxy_bind: >-
+    {{ [{
+          'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
+          'interface': haproxy_bind_internal_lb_vip_interface | default('')
+    }] }}
   haproxy_port: 8185
   haproxy_balance_type: tcp
   haproxy_timeout_client: 5000s

inventory/group_vars/nova_all/haproxy_service.yml

@@ -26,7 +26,11 @@ haproxy_nova_healthcheck_hdr: 'hdr User-Agent "osa-proxy-healthcheck"'
 haproxy_nova_api_metadata_service:
   haproxy_service_name: nova_api_metadata
   haproxy_backend_nodes: "{{ groups['nova_api_metadata'] | default([]) }}"
-  haproxy_bind: "{{ [haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address)] }}"
+  haproxy_bind: >-
+    {{ [{
+          'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
+          'interface': haproxy_bind_internal_lb_vip_interface | default('')
+    }] }}
   haproxy_port: 8775
   haproxy_ssl: "{{ haproxy_ssl_all_vips }}"
   haproxy_balance_type: http

inventory/group_vars/rabbitmq_all.yml

@@ -41,7 +41,11 @@ haproxy_rabbitmq_service:
   haproxy_ssl: "{{ rabbitmq_management_ssl | bool }}"
   haproxy_backend_ssl: "{{ rabbitmq_management_ssl | bool }}"
   haproxy_backend_ca: False
-  haproxy_bind: "{{ [haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address)] }}"
+  haproxy_bind: >-
+    {{ [{
+          'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
+          'interface': haproxy_bind_internal_lb_vip_interface | default('')
+    }] }}
   haproxy_port: "{{ (rabbitmq_management_ssl | bool) | ternary(15671, 15672) }}"
   haproxy_balance_type: http
   haproxy_backend_httpcheck_options:

inventory/group_vars/repo_all.yml

@@ -34,7 +34,11 @@ openstack_repo_server_enable_glusterfs: True
 haproxy_repo_service:
   haproxy_service_name: repo_all
   haproxy_backend_nodes: "{{ groups['repo_all'] | default([]) }}"
-  haproxy_bind: "{{ [haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address)] }}"
+  haproxy_bind: >-
+    {{ [{
+          'address': haproxy_bind_internal_lb_vip_address | default(internal_lb_vip_address),
+          'interface': haproxy_bind_internal_lb_vip_interface | default('')
+    }] }}
   haproxy_port: 8181
   haproxy_ssl: "{{ haproxy_ssl_all_vips }}"
   haproxy_balance_type: http