From d7f5b368547f37cfa53cd606f3d72fab44b6bd7f Mon Sep 17 00:00:00 2001 From: elijah Date: Fri, 20 Sep 2013 12:15:36 -0700 Subject: use newer haproxy_servers macro in order to allow couchdb and webapp to be on the same node (requires latest leap_cli) --- provider_base/services/webapp.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'provider_base/services') diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json index e47f047b..6f2beb8a 100644 --- a/provider_base/services/webapp.json +++ b/provider_base/services/webapp.json @@ -20,8 +20,7 @@ "couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)" }, "haproxy": { - "local_ports": "= stunnel.couch_client.field(:accept_port)", - "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)" + "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client, global.services[:couchdb].couch.port)" }, "definition_files": { "provider": "= file :provider_json_template", -- cgit v1.2.3