Merge ~ines-almeida/ols-charm-deps:specify-yaml-error-http-layer into ols-charm-deps:master

[Ines Almeida]

Specify YAML exceptions in ols-http layer

[Colin Watson (cjwatson)]

review: Approve

[Otto Co-Pilot (otto-copilot)]

Project setup failed
https://jenkins.ols.canonical.com/online-services/job/ols-layers/96/

diff --git a/layer/ols-http/reactive/ols_http.py b/layer/ols-http/reactive/ols_http.py
index 279615c..ba58d53 100644
--- a/layer/ols-http/reactive/ols_http.py
+++ b/layer/ols-http/reactive/ols_http.py
@@ -56,7 +56,7 @@ def configure_loadbalancer(lb):
 
         try:
             yaml.safe_load(services_yaml)
-        except Exception:
+        except yaml.YAMLError:
             hookenv.log('Could not parse templated haproxy yaml')
             hookenv.status_set('blocked', 'bad haproxy_services yaml template config')
             return
@@ -64,7 +64,7 @@ def configure_loadbalancer(lb):
     else:
         try:
             options = yaml.safe_load(config.get('haproxy_service_options'))
-        except Exception:
+        except yaml.YAMLError:
             hookenv.log('could not parse haproxy_service_options yaml')
             hookenv.status_set('blocked', 'bad haproxy_service_options yaml config')
             return