Merge lp:~thomir-deactivatedaccount/charm-haproxy/make-config-less-insane into lp:~ubuntuone-pqm-team/charm-haproxy/snap-store

[Thomi Richards]

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2017-07-25 07:08:49 +0000
+++ hooks/hooks.py	2017-07-25 07:57:42 +0000
@@ -349,13 +349,13 @@
                 be_options.append(o)
 
         # Filter provided service options into frontend-only and backend-only.
-        # XXX: The '{FE}' and '{BE}' feature is a local patch in this version
+        # 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}'):
+            if option.startswith('<FE>'):
                 fe_options.append(option[4:].strip())
-            elif option.startswith('{BE}'):
+            elif option.startswith('<BE>'):
                 be_options.append(option[4:].strip())
             else:
                 if any(map(option.startswith, frontend_only_options)):