Shorten gateway properties reference

Change-Id: I535900dd327ff4a7cf8cad35923572f218c373d0
cloudfoundry-attic · Jul 6, 2012 · c9b0a57 · c9b0a57
1 parent 0f90442
commit c9b0a57
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 64 deletions.
diff --git a/jobs/atmos_gateway/templates/atmos_gateway.yml.erb b/jobs/atmos_gateway/templates/atmos_gateway.yml.erb
@@ -1,6 +1,8 @@
 ---
 <%
-acls = properties.atmos_gateway.acls
+service = "atmos"
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 nats = "nats://#{properties.nats.user}:#{properties.nats.password}@#{properties.nats.address}:#{properties.nats.port}"
 %>
 mbus: <%= nats %>
@@ -35,10 +37,10 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.atmos_gateway.ip_route %>
-ip_route: <%= properties.atmos_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.atmos_gateway.token %>
+token: <%= gateway.token %>
 
 logging:
   file: /var/vcap/sys/log/atmos_gateway/atmos_gateway.log

diff --git a/jobs/filesystem_gateway/templates/filesystem_gateway.yml.erb b/jobs/filesystem_gateway/templates/filesystem_gateway.yml.erb
@@ -1,6 +1,8 @@
 ---
 <%
-acls = properties.filesystem_gateway.acls
+service = "filesystem"
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 nats = "nats://#{properties.nats.user}:#{properties.nats.password}@#{properties.nats.address}:#{properties.nats.port}"
 %>
 mbus: <%= nats %>
@@ -34,8 +36,8 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.filesystem_gateway.ip_route %>
-ip_route: <%= properties.filesystem_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
 token: <%= properties.filesystem_gateway.token %>
 
@@ -50,7 +52,7 @@ pid: /var/vcap/sys/run/filesystem_gateway/filesystem_gateway.pid
 
 fs_type: nfs
 backends:
-<% for backend in properties.filesystem_gateway.backends %>
+<% for backend in gateway.backends %>
   - host: <%= backend.host %>
     export: <%= backend.export %>
     mount: <%= backend.mount %>

diff --git a/jobs/memcached_gateway/templates/memcached_gateway.yml.erb b/jobs/memcached_gateway/templates/memcached_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "memcached"
-acls = properties.memcached_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -38,10 +39,10 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.memcached_gateway.ip_route %>
-ip_route: <%= properties.memcached_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.memcached_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/memcached_gateway/memcached_gateway.log
   level: debug
@@ -50,7 +51,7 @@ logging:
   <% end %>
 
 pid: /var/vcap/sys/run/memcached_gateway/memcached_gateway.pid
-z_interval: <%= properties.memcached_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.memcached_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.memcached_gateway.double_check_orphan_interval || 300 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
diff --git a/jobs/mongodb_gateway/templates/mongodb_gateway.yml.erb b/jobs/mongodb_gateway/templates/mongodb_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "mongodb"
-acls = properties.mongodb_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -43,10 +44,10 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.mongodb_gateway.ip_route %>
-ip_route: <%= properties.mongodb_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.mongodb_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/mongodb_gateway/mongodb_gateway.log
   level: debug
@@ -55,10 +56,10 @@ logging:
   <% end %>
 
 pid: /var/vcap/sys/run/mongodb_gateway/mongodb_gateway.pid
-node_timeout: <%= properties.mongodb_gateway.node_timeout || 8 %>
-z_interval: <%= properties.mongodb_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.mongodb_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.mongodb_gateway.double_check_orphan_interval || 300 %>
+node_timeout: <%= gateway.node_timeout || 8 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
 
 <% if lifecycle and lifecycle.resque %>

diff --git a/jobs/mysql_gateway/templates/mysql_gateway.yml.erb b/jobs/mysql_gateway/templates/mysql_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "mysql"
-acls = properties.mysql_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -43,10 +44,10 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.mysql_gateway.ip_route %>
-ip_route: <%= properties.mysql_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.mysql_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/mysql_gateway/mysql_gateway.log
   level: debug
@@ -55,12 +56,12 @@ logging:
   <% end %>
 
 
-node_timeout: <%= properties.mysql_gateway.node_timeout || 8 %>
+node_timeout: <%= gateway.node_timeout || 8 %>
 
 pid: /var/vcap/sys/run/mysql_gateway/mysql_gateway.pid
-z_interval: <%= properties.mysql_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.mysql_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.mysql_gateway.double_check_orphan_interval || 300 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
 <% if lifecycle and lifecycle.resque %>
 resque:

diff --git a/jobs/postgresql_gateway/templates/postgresql_gateway.yml.erb b/jobs/postgresql_gateway/templates/postgresql_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "postgresql"
-acls = properties.postgresql_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -44,23 +45,23 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.postgresql_gateway.ip_route %>
-ip_route: <%= properties.postgresql_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.postgresql_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/postgresql_gateway/postgresql_gateway.log
   level: debug
   <% if properties.syslog_aggregator %>
   syslog: vcap.postgresql_gateway
   <% end %>
 
-node_timeout: <%= properties.postgresql_gateway.node_timeout || 8 %>
+node_timeout: <%= gateway.node_timeout || 8 %>
 
 pid: /var/vcap/sys/run/postgresql_gateway/postgresql_gateway.pid
-z_interval: <%= properties.postgresql_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.postgresql_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.postgresql_gateway.double_check_orphan_interval || 300 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
 
 <% if lifecycle and lifecycle.resque %>

diff --git a/jobs/rabbit_gateway/templates/rabbit_gateway.yml.erb b/jobs/rabbit_gateway/templates/rabbit_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "rabbit"
-acls = properties.rabbit_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -40,12 +41,12 @@ service:
     <% end %>
   <% end %>
 <% end %>
-  timeout: <%= properties.rabbit_gateway.service_timeout || 15 %>
+  timeout: <%= gateway.service_timeout || 15 %>
 
-<% if properties.rabbit_gateway.ip_route %>
-ip_route: <%= properties.rabbit_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.rabbit_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/rabbit_gateway/rabbit_gateway.log
   level: debug
@@ -54,11 +55,11 @@ logging:
   <% end %>
 
 pid: /var/vcap/sys/run/rabbit_gateway/rabbit_gateway.pid
-z_interval: <%= properties.rabbit_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.rabbit_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.rabbit_gateway.double_check_orphan_interval || 300 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
-node_timeout: <%= properties.rabbit_gateway.node_timeout || 10 %>
+node_timeout: <%= gateway.node_timeout || 10 %>
 
 <% if plan_enabled %>
 plan_management:

diff --git a/jobs/redis_gateway/templates/redis_gateway.yml.erb b/jobs/redis_gateway/templates/redis_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "redis"
-acls = properties.redis_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -43,10 +44,10 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.redis_gateway.ip_route %>
-ip_route: <%= properties.redis_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.redis_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/redis_gateway/redis_gateway.log
   level: debug
@@ -55,10 +56,10 @@ logging:
   <% end %>
 
 pid: /var/vcap/sys/run/redis_gateway/redis_gateway.pid
-node_timeout: <%= properties.redis_gateway.node_timeout || 8 %>
-z_interval: <%= properties.redis_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.redis_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.redis_gateway.double_check_orphan_interval || 300 %>
+node_timeout: <%= gateway.node_timeout || 8 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
 <% if lifecycle and lifecycle.resque %>
 resque:

diff --git a/jobs/vblob_gateway/templates/vblob_gateway.yml.erb b/jobs/vblob_gateway/templates/vblob_gateway.yml.erb
@@ -1,7 +1,8 @@
 ---
 <%
 service = "vblob"
-acls = properties.vblob_gateway.acls
+gateway = eval("properties.#{service}_gateway")
+acls = gateway.acls
 plan_enabled = properties.service_plans && properties.service_plans.send(service.to_sym)
 plan_mgmt = plan_enabled && properties.service_plans.send(service.to_sym)
 plan_mgmt.instance_eval("def fields; @table.keys; end;") if plan_mgmt
@@ -42,10 +43,10 @@ service:
   <% end %>
 <% end %>
 
-<% if properties.vblob_gateway.ip_route %>
-ip_route: <%= properties.vblob_gateway.ip_route %>
+<% if gateway.ip_route %>
+ip_route: <%= gateway.ip_route %>
 <% end %>
-token: <%= properties.vblob_gateway.token %>
+token: <%= gateway.token %>
 logging:
   file: /var/vcap/sys/log/vblob_gateway/vblob_gateway.log
   level: debug
@@ -54,10 +55,10 @@ logging:
   <% end %>
 
 pid: /var/vcap/sys/run/vblob_gateway/vblob_gateway.pid
-node_timeout: <%= properties.vblob_gateway.node_timeout || 8 %>
-z_interval: <%= properties.vblob_gateway.z_interval || 30 %>
-check_orphan_interval: <%= properties.vblob_gateway.check_orphan_interval || -1 %>
-double_check_orphan_interval: <%= properties.vblob_gateway.double_check_orphan_interval || 300 %>
+node_timeout: <%= gateway.node_timeout || 8 %>
+z_interval: <%= gateway.z_interval || 30 %>
+check_orphan_interval: <%= gateway.check_orphan_interval || -1 %>
+double_check_orphan_interval: <%= gateway.double_check_orphan_interval || 300 %>
 max_nats_payload: <%= properties.nats.max_payload || 1048576 %>
 
 <% if plan_enabled %>