commit cc5ee83e0502c9664dd249746ac8b3dd8c09fff3
author Vasyl Saienko <vsaienko@mirantis.com> Wed Aug 01 12:40:54 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Wed Aug 01 12:40:54 2018 +0000
tree 7f385ae249c147a0fa49973e73c5e4fb19e65874
parent c0772d7304ba9684214b7b76a8c65c36dac2e87c
parent 739efbae4c3ca2eaf2641494c9965f55a2d044bf

Merge "Relaxing haproxy hash to give an ability to use specific ports and check params."

haproxy/proxy/listen/openstack/neutron.yml

diff --git a/haproxy/proxy/listen/openstack/neutron.yml b/haproxy/proxy/listen/openstack/neutron.yml
index 29bd548..ebc3f1a 100644
--- a/haproxy/proxy/listen/openstack/neutron.yml
+++ b/haproxy/proxy/listen/openstack/neutron.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    haproxy_neutron_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+    haproxy_neutron_port: 9696
   haproxy:
     proxy:
       listen:
@@ -7,17 +10,17 @@
           service_name: neutron
           binds:
           - address: ${_param:cluster_vip_address}
-            port: 9696
+            port: ${_param:haproxy_neutron_port}
           servers:
           - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}

haproxy/proxy/listen/openstack/neutron_large.yml

diff --git a/haproxy/proxy/listen/openstack/neutron_large.yml b/haproxy/proxy/listen/openstack/neutron_large.yml
index 8df1243..5039586 100644
--- a/haproxy/proxy/listen/openstack/neutron_large.yml
+++ b/haproxy/proxy/listen/openstack/neutron_large.yml
@@ -1,4 +1,7 @@
 parameters:
+  _param:
+    haproxy_neutron_check_params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+    haproxy_neutron_port: 9696
   haproxy:
     proxy:
       listen:
@@ -7,25 +10,25 @@
           service_name: neutron
           binds:
           - address: ${_param:cluster_vip_address}
-            port: 9696
+            port: ${_param:haproxy_neutron_port}
           servers:
           - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node04_hostname}
             host: ${_param:cluster_node04_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}
           - name: ${_param:cluster_node05_hostname}
             host: ${_param:cluster_node05_address}
-            port: 9696
-            params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
\ No newline at end of file
+            port: ${_param:haproxy_neutron_port}
+            params: ${_param:haproxy_neutron_check_params}