diff options
| author | elijah <elijah@riseup.net> | 2013-09-20 12:15:36 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-09-20 12:15:36 -0700 |
| commit | d7f5b368547f37cfa53cd606f3d72fab44b6bd7f (patch) | |
| tree | 947963585a525b85952d91515b40aad418ab21bc | |
| parent | 3d4960e59c1c742fc0706b37a40e03b698865587 (diff) | |
use newer haproxy_servers macro in order to allow couchdb and webapp to be on the same node (requires latest leap_cli)
| -rw-r--r-- | platform.rb | 2 | ||||
| -rw-r--r-- | provider_base/services/webapp.json | 3 | ||||
| -rw-r--r-- | puppet/modules/site_webapp/manifests/haproxy.pp | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/platform.rb b/platform.rb index 5f442c0c..c68aac86 100644 --- a/platform.rb +++ b/platform.rb @@ -4,7 +4,7 @@ Leap::Platform.define do self.version = "0.2.4" - self.compatible_cli = "1.2.2".."1.99" + self.compatible_cli = "1.2.3".."1.99" # # the facter facts that should be gathered 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", diff --git a/puppet/modules/site_webapp/manifests/haproxy.pp b/puppet/modules/site_webapp/manifests/haproxy.pp index 4a7e3c25..b69c69da 100644 --- a/puppet/modules/site_webapp/manifests/haproxy.pp +++ b/puppet/modules/site_webapp/manifests/haproxy.pp @@ -3,7 +3,6 @@ class site_webapp::haproxy { include site_haproxy $haproxy = hiera('haproxy') - $local_ports = $haproxy['local_ports'] # Template uses $global_options, $defaults_options concat::fragment { 'leap_haproxy_webapp_couchdb': |