Merge haproxy.router.server.(z1 & z2) into haproxy.router.servers pro…

…perty

[#114950551]

Signed-off-by: Shash Reddy <sreddy@pivotal.io>

jobs/haproxy/spec

@@ -40,11 +40,8 @@ properties:
   request_timeout_in_seconds:
     description: "Server and client timeouts in seconds"
     default: 900
-  router.servers.z1:
-    description: "Array of the router IPs acting as the first group of HTTP/TCP backends"
-    default: []
-  router.servers.z2:
-    description: "Array of the router IPs acting as the second group of HTTP/TCP backends"
+  router.servers:
+    description: "Array of router IPs"
     default: []
   router.port:
     description: "Listening port for Router"

jobs/haproxy/templates/haproxy.conf.erb

@@ -50,23 +50,15 @@ frontend ssl-in
 backend http-routers
     mode http
     balance roundrobin
-    <% size = p("router.servers.z1").size %>
 
-    <% p("router.servers.z1").each_with_index do |ip, index| %>
+    <% p("router.servers").each_with_index do |ip, index| %>
         server node<%= index %> <%= ip %>:<%= p("router.port") %> check inter 1000
     <% end %>
-    <% p("router.servers.z2").each_with_index do |ip, index| %>
-        server node<%= index + size %> <%= ip %>:<%= p("router.port") %> check inter 1000
-    <% end %>
 
 backend tcp-routers
     mode tcp
     balance roundrobin
-    <% size = p("router.servers.z1").size %>
 
-    <% p("router.servers.z1").each_with_index do |ip, index| %>
+    <% p("router.servers").each_with_index do |ip, index| %>
         server node<%= index %> <%= ip %>:<%= p("router.port") %> check inter 1000
     <% end %>
-    <% p("router.servers.z2").each_with_index do |ip, index| %>
-        server node<%= index + size %> <%= ip %>:<%= p("router.port") %> check inter 1000
-    <% end %>

jobs/haproxy/templates/haproxy.ctmpl.erb

@@ -50,26 +50,18 @@ frontend ssl-in
 backend http-routers
     mode http
     balance roundrobin
-    <% size = p("router.servers.z1").size %>
 
-    <% p("router.servers.z1").each_with_index do |ip, index| %>
+    <% p("router.servers").each_with_index do |ip, index| %>
         server node<%= index %> <%= ip %>:<%= p("router.port") %> check inter 1000
     <% end %>
-    <% p("router.servers.z2").each_with_index do |ip, index| %>
-        server node<%= index + size %> <%= ip %>:<%= p("router.port") %> check inter 1000
-    <% end %>
 
 backend tcp-routers
     mode tcp
     balance roundrobin
-    <% size = p("router.servers.z1").size %>
 
-    <% p("router.servers.z1").each_with_index do |ip, index| %>
+    <% p("router.servers").each_with_index do |ip, index| %>
         server node<%= index %> <%= ip %>:<%= p("router.port") %> check inter 1000
     <% end %>
-    <% p("router.servers.z2").each_with_index do |ip, index| %>
-        server node<%= index + size %> <%= ip %>:<%= p("router.port") %> check inter 1000
-    <% end %>
 
 <% if p("cc.allow_app_ssh_access") %>
 {{$services := service "ssh-proxy" "passing"}}

spec/fixtures/aws/cf-manifest.yml

@@ -71,9 +71,7 @@ jobs:
     metron_agent:
       zone: z1
     router:
-      servers:
-        z1: null
-        z2: null
+      servers: null
   resource_pool: router_z1
   templates:
   - name: haproxy

spec/fixtures/bosh-lite/cf-manifest.yml

@@ -159,9 +159,7 @@ jobs:
       zone: z1
     router:
       servers:
-        z1:
         - 10.244.0.22
-        z2: []
   resource_pool: router_z1
   templates:
   - name: haproxy

spec/fixtures/openstack/cf-manifest.yml

@@ -83,9 +83,7 @@ jobs:
       zone: z1
     router:
       servers:
-        z1:
         - 10.10.0.130
-        z2: []
   resource_pool: router_z1
   templates:
   - name: haproxy

spec/fixtures/vsphere/cf-manifest.yml

@@ -81,9 +81,7 @@ jobs:
       zone: z1
     router:
       servers:
-        z1:
         - 10.85.9.235
-        z2:
         - 10.85.10.235
   resource_pool: router_z1
   templates:

templates/cf.yml

@@ -57,9 +57,7 @@ jobs:
     properties:
       ha_proxy:
       router:
-        servers:
-          z1: (( merge || jobs.router_z1.networks.cf1.static_ips || nil ))
-          z2: (( merge || jobs.router_z2.networks.cf2.static_ips || nil ))
+        servers: (( merge || jobs.router_z1.networks.cf1.static_ips jobs.router_z2.networks.cf2.static_ips || nil ))
       metron_agent:
         zone: z1
     update: (( merge || empty_hash ))