summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2013-07-26 02:35:04 -0700
committerelijah <elijah@riseup.net>2013-07-26 02:35:04 -0700
commit4766d719b1181b636dc57374b478d2c21e369dc1 (patch)
tree0ec63e62dfb0af534d5318adb1bd5791b16e43de
parent26a443be18ec15e972da2aed776c2a918736922a (diff)
added haproxy weights to webapp hiera (at haproxy.servers)
-rw-r--r--platform.rb2
-rw-r--r--provider_base/services/webapp.json3
2 files changed, 3 insertions, 2 deletions
diff --git a/platform.rb b/platform.rb
index 9921f3a2..32b8fd19 100644
--- a/platform.rb
+++ b/platform.rb
@@ -4,7 +4,7 @@
Leap::Platform.define do
self.version = "0.2.3"
- self.compatible_cli = "1.1.3".."1.99"
+ self.compatible_cli = "1.1.4".."1.99"
#
# the facter facts that should be gathered
diff --git a/provider_base/services/webapp.json b/provider_base/services/webapp.json
index 93396ec7..55331274 100644
--- a/provider_base/services/webapp.json
+++ b/provider_base/services/webapp.json
@@ -19,7 +19,8 @@
"couch_client": "= stunnel_client(nodes_like_me[:services => :couchdb], global.services[:couchdb].couch.port)"
},
"haproxy": {
- "local_ports": "= stunnel.couch_client.field(:accept_port)"
+ "local_ports": "= stunnel.couch_client.field(:accept_port)",
+ "servers": "= haproxy_servers(nodes_like_me[:services => :couchdb], stunnel.couch_client)"
},
"definition_files": {
"provider": "= file :provider_json_template",