commit f665ac54edee0d4278533db4fd0258dfc532277c
author Alexandru Avadanii <Alexandru.Avadanii@enea.com> Sun Dec 10 21:05:12 2017 +0100
committer Alexandru Avadanii <Alexandru.Avadanii@enea.com> Fri Dec 15 00:14:09 2017 +0100
tree 870111343c80fd7b34d61d53fdc891ec0afbaeaa
parent 74f5df259264c330637120ace4652c3a25aae255

haproxy: Parameterize cluster hostnames

Replace ctl{01,02,03} with reclass params, i.e.:
s/ctl01/${_param:cluster_node01_hostname}/g

Affects haproxy configuration in:
- haproxy.proxy.listen.openstack
- neutron.control

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

neutron/control/cluster.yml

diff --git a/neutron/control/cluster.yml b/neutron/control/cluster.yml
index 47928b6..ea9596d 100644
--- a/neutron/control/cluster.yml
+++ b/neutron/control/cluster.yml
@@ -21,15 +21,15 @@
           - address: ${_param:cluster_vip_address}
             port: 9696
           servers:
-          - name: ctl01
+          - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
             port: 9696
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
+          - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
             port: 9696
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
+          - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
             port: 9696
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3

neutron/control/openvswitch/cluster.yml

diff --git a/neutron/control/openvswitch/cluster.yml b/neutron/control/openvswitch/cluster.yml
index 032ffbf..80489c8 100644
--- a/neutron/control/openvswitch/cluster.yml
+++ b/neutron/control/openvswitch/cluster.yml
@@ -47,15 +47,15 @@
           - address: ${_param:cluster_vip_address}
             port: 9696
           servers:
-          - name: ctl01
+          - name: ${_param:cluster_node01_hostname}
             host: ${_param:cluster_node01_address}
             port: 9696
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl02
+          - name: ${_param:cluster_node02_hostname}
             host: ${_param:cluster_node02_address}
             port: 9696
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3
-          - name: ctl03
+          - name: ${_param:cluster_node03_hostname}
             host: ${_param:cluster_node03_address}
             port: 9696
             params: check inter 10s fastinter 2s downinter 3s rise 3 fall 3