Merge lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane into lp:charm-haproxy

[Thomi Richards]

Unmerged revisions

119. By Thomi Richards on 2017-07-25

Use <> instead of {} since {} is yaml token for a dictionary.

118. By Thomi Richards on 2017-07-25

Fixed failing test.

117. By Thomi Richards on 2017-07-25

Code cleanups.

116. By Thomi Richards on 2017-07-25

Code cleanups.

115. By Thomi Richards on 2017-07-25

Code cleanups.

114. By Thomi Richards on 2017-07-25

Code cleanups.

113. By Thomi Richards on 2017-07-25

Consolidate two loops.

112. By Thomi Richards on 2017-07-25

Fix service option filtering.

111. By Thomi Richards on 2017-07-25

Hack in a way for users to force an option to a particular section of the config.

110. By William Grant on 2017-05-20

Increase nagios haproxy queue depth thresholds until they're configurable.

=== modified file 'files/nrpe/check_haproxy_queue_depth.sh'
--- files/nrpe/check_haproxy_queue_depth.sh	2015-05-12 15:10:44 +0000
+++ files/nrpe/check_haproxy_queue_depth.sh	2017-07-25 07:56:43 +0000
@@ -7,8 +7,8 @@
 # Author: Tom Haddon
 
 # These should be config options at some stage
-CURRQthrsh=0
-MAXQthrsh=100
+CURRQthrsh=10
+MAXQthrsh=500
 
 AUTH=$(grep -r "stats auth" /etc/haproxy | head -1 | awk '{print $4}')
 
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-11-22 11:15:13 +0000
+++ hooks/hooks.py	2017-07-25 07:56:43 +0000
@@ -347,16 +347,24 @@
             if any(map(o.strip().startswith, service_options)):
                 fe_options.append(o)
                 be_options.append(o)
+
         # Filter provided service options into frontend-only and backend-only.
-        results = izip(
-            (fe_options, be_options),
-            (True, False),
-            tee((o, any(map(o.strip().startswith,
-                            frontend_only_options)))
-                for o in service_options))
-        for out, cond, result in results:
-            out.extend(option for option, match in result
-                       if match is cond and option not in out)
+        # XXX: The '<FE>' and '<BE>' feature is a local patch in this version
+        # of the charm, and is not present in the upstream charm.
+        for option in service_options:
+            option = option.strip()
+            if option.startswith('<FE>'):
+                fe_options.append(option[4:].strip())
+            elif option.startswith('<BE>'):
+                be_options.append(option[4:].strip())
+            else:
+                if any(map(option.startswith, frontend_only_options)):
+                    if option not in fe_options:
+                        fe_options.append(option)
+                else:
+                    if option not in be_options:
+                        be_options.append(option)
+
     service_config = []
     unit_name = os.environ["JUJU_UNIT_NAME"].replace("/", "-")
     service_config.append("frontend %s-%s" % (unit_name, service_port))
@@ -795,7 +803,7 @@
                 service_name,
                 service_config['service_host'],
                 service_config['service_port'],
-                service_config['service_options'],
+                service_config.get('service_options', []),
                 server_entries, errorfiles, crts, backends))