Merge lp:~matthias-cramer/charms/precise/haproxy/appsession into lp:charms/haproxy

[Matthias Cramer]

Added possibility to add appsession parameter to the configfile

[Tom Haddon (mthaddon)]

There seem to be two text conflicts in the merge proposal - can you take a look?

Also, I think this may be achievable within the existing charm just by appending "spip_session len 34 timeout 3h request-learn" to the "service_options" parameter. As an example, if you have this:

    services: |
              - service_name: haproxy_service
                service_host: "0.0.0.0"
                service_port: 80
                service_options: [option httpchk GET /, balance leastconn]
                server_options: check inter 2000 rise 2 fall 5 maxconn 32

You could simply change it to this:

    services: |
              - service_name: haproxy_service
                service_host: "0.0.0.0"
                service_port: 80
                service_options: [option httpchk GET /, balance leastconn, spip_session len 34 timeout 3h request-learn]
                server_options: check inter 2000 rise 2 fall 5 maxconn 32

Can you try that and see if it does what you're hoping to achieve?

review: Needs Fixing

[Pierre Amadio (pierre-amadio)]

I was able to deploy the vanilla haproxy charm with the following yaml file:

melmoth@x220:~/dev/spip-juju$ cat spip.yaml
haproxy:
     default_timeouts: "queue 7000, connect 7000, client 7000, server 7000"
     services: |
                - service_name: haproxy_service
                  service_host: "0.0.0.0"
                  service_port: 80
                  service_options: [balance leastconn , appsession spip_session len 34 timeout 3h request-learn]
                  server_options: maxconn 100
spip:
     spip-origin: 3.0.5

The haproxy.cfg configuration file ends up with the same content as what it would have been using the merge proposal and setting listen_appsession to 'spip_session len 34 timeout 3h request-learn'

Looks to me the merge request is not needed.

[Tom Haddon (mthaddon)]

> I was able to deploy the vanilla haproxy charm with the following yaml file:
>
> melmoth@x220:~/dev/spip-juju$ cat spip.yaml
> haproxy:
> default_timeouts: "queue 7000, connect 7000, client 7000, server 7000"
> services: |
> - service_name: haproxy_service
> service_host: "0.0.0.0"
> service_port: 80
> service_options: [balance leastconn , appsession
> spip_session len 34 timeout 3h request-learn]
> server_options: maxconn 100
> spip:
> spip-origin: 3.0.5
>
> The haproxy.cfg configuration file ends up with the same content as what it
> would have been using the merge proposal and setting listen_appsession to
> 'spip_session len 34 timeout 3h request-learn'
>
>
> Looks to me the merge request is not needed.

Marking as rejected per this comment

Unmerged revisions

65. By Matthias Cramer on 2013-02-14

added more description

64. By Matthias Cramer on 2013-02-14

Added config parameter listen_appsession to set appsession parameter

=== modified file 'config.yaml'
--- config.yaml	2012-10-10 14:38:47 +0000
+++ config.yaml	2013-02-15 10:30:34 +0000
@@ -66,6 +66,10 @@
     default: False
     type: boolean
     description: Enable monitoring
+  listen_appsession:
+    default: ""
+    type: string
+    description: appsession config e.g. 'spip_session len 34 timeout 3h request-learn'
   monitoring_port:
     default: 10000
     type: int
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2013-02-14 21:35:47 +0000
+++ hooks/hooks.py	2013-02-15 10:30:34 +0000
@@ -269,7 +269,7 @@
 #------------------------------------------------------------------------------
 def create_listen_stanza(service_name=None, service_ip=None,
                          service_port=None, service_options=None,
-                         server_entries=None):
+                         server_entries=None, listen_appsession=None):
     if service_name is None or service_ip is None or service_port is None:
         return(None)
     service_config = []
@@ -278,6 +278,8 @@
     if service_options is not None:
         for service_option in service_options:
             service_config.append("    %s" % service_option.strip())
+    if listen_appsession is not None:
+        service_config.append("    appsession %s" % listen_appsession.strip())    
     if server_entries is not None and isinstance(server_entries, list):
         for (server_name, server_ip, server_port, server_options) \
         in server_entries:
@@ -449,7 +451,25 @@
 #------------------------------------------------------------------------------
 def create_services():
     services_list = get_config_services()
+<<<<<<< TREE
     services_dict = get_services_dict()
+=======
+    services_dict = {}
+    for service_item in services_list:
+        service_name = service_item['service_name']
+        service_host = service_item['service_host']
+        service_port = service_item['service_port']
+        service_options = service_item['service_options']
+        server_options = service_item['server_options']
+        services_dict[service_name] = {'service_name': service_name,
+                                         'service_host': service_host,
+                                         'service_port': service_port,
+                                         'service_options': service_options,
+                                         'server_options': server_options}
+    
+    config_data = config_get()
+    listen_appsession = yaml.load(config_data['listen_appsession'])
+>>>>>>> MERGE-SOURCE
 
     # service definitions overwrites user specified haproxy file in
     # a pseudo-template form
@@ -505,7 +525,7 @@
                                      services_dict[service]['service_host'],
                                      services_dict[service]['service_port'],
                                      services_dict[service]['service_options'],
-                                     server_entries))
+                                     server_entries,listen_appsession))
 
 
 #------------------------------------------------------------------------------
 
=== modified file 'revision'
--- revision	2013-02-14 21:35:47 +0000
+++ revision	2013-02-15 10:30:34 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 42
+=======
+32
+>>>>>>> MERGE-SOURCE