Merge lp:~james-page/charms/precise/glance/notification into lp:~openstack-charmers-archive/charms/precise/glance/trunk

[James Page]

Fixup problems when glance is not related to rabbitmq-server

[James Page (james-page)]

This can also be merged into the lp:charms/trusty/glance branch if OK

[Liam Young (gnuoy)]

lgtm

review: Approve

=== modified file 'templates/folsom/glance-api.conf'
--- templates/folsom/glance-api.conf	2014-03-31 11:29:37 +0000
+++ templates/folsom/glance-api.conf	2014-04-21 07:46:58 +0000
@@ -30,7 +30,10 @@
 
 {% include "parts/rabbitmq-single" %}
 
+{% if rabbitmq_host or rabbitmq_hosts -%}
 notifier_strategy = rabbit
+{% endif -%}
+
 filesystem_store_datadir = /var/lib/glance/images/
 
 {% if swift_store %}

=== modified file 'templates/icehouse/glance-api.conf'
--- templates/icehouse/glance-api.conf	2014-04-12 16:55:29 +0000
+++ templates/icehouse/glance-api.conf	2014-04-21 07:46:58 +0000
@@ -32,7 +32,10 @@
 
 {% include "parts/rabbitmq" %}
 
-notifier_strategy = rabbit
+{% if rabbitmq_host or rabbitmq_hosts -%}
+notification_driver = rabbit
+{% endif -%}
+
 filesystem_store_datadir = /var/lib/glance/images/
 
 {% if swift_store -%}