Merge "Bind to v4 and v6 in haproxy"

playbooks/group_vars/gitea-lb.yaml

@@ -1,7 +1,7 @@
 haproxy_listeners:
   - name: balance_git_http
     bind:
-      - '*:80'
+      - ':::80'
     servers:
       - name: 'gitea01.opendev.org'
         address: '38.108.68.93:3080'
@@ -21,7 +21,7 @@ haproxy_listeners:
         address: '38.108.68.22:3080'
   - name: balance_git_https
     bind:
-      - '*:443'
+      - ':::443'
     servers:
       - name: 'gitea01.opendev.org'
         address: '38.108.68.93:3000'

playbooks/roles/haproxy/templates/haproxy.cfg.j2

@@ -31,4 +31,5 @@ listen {{ listener.name }}
   {% for server in listener.servers %}
   server {{ server.name }} {{ server.address }}
   {% endfor %}
+
 {% endfor %}

playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2

@@ -1,13 +1,13 @@
 haproxy_listeners:
   - name: balance_git_http
     bind:
-      - "*:80"
+      - ":::80"
     servers:
       - name: "gitea01.opendev.org"
         address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080"
   - name: balance_git_https
     bind:
-      - "*:443"
+      - ":::443"
     servers:
       - name: "gitea01.opendev.org"
         address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3000"