Merge ~gnuoy/charms/+source/interface-rabbitmq:master into ~openstack-charmers-layers/charms/+source/interface-rabbitmq:master

[Liam Young]

[James Page (james-page)]

+1

review: Approve

diff --git a/requires.py b/requires.py
index 06c9fc2..7a50d66 100644
--- a/requires.py
+++ b/requires.py
@@ -35,18 +35,26 @@ class RabbitMQRequires(RelationBase):
     def joined(self):
         self.set_state('{relation_name}.connected')
 
-    @hook('{requires:rabbitmq}-relation-changed')
-    def changed(self):
+    def update_state(self):
         if self.base_data_complete():
             self.set_state('{relation_name}.available')
             if self.ssl_data_complete():
                 self.set_state('{relation_name}.available.ssl')
+            else:
+                self.remove_state('{relation_name}.available.ssl')
+        else:
+            self.remove_state('{relation_name}.available')
+            self.remove_state('{relation_name}.available.ssl')
+        if not self.rabbitmq_hosts():
+            self.remove_state('{relation_name}.connected')
+
+    @hook('{requires:rabbitmq}-relation-changed')
+    def changed(self):
+        self.update_state()
 
     @hook('{requires:rabbitmq}-relation-{broken,departed}')
     def departed(self):
-        self.remove_state('{relation_name}.connected')
-        self.remove_state('{relation_name}.available')
-        self.remove_state('{relation_name}.available.ssl')
+        self.update_state()
 
     def base_data_complete(self):
         """