From 3482bf647a0210bc1f9bf79664fb899868150e9e Mon Sep 17 00:00:00 2001
From: Felipe Reyes <felipe.reyes@canonical.com>
Date: Thu, 20 Nov 2014 13:51:44 -0300
Subject: [PATCH] Renamed relation from 'cache' to 'memcache'

---
 hooks/{cache-relation-broken => memcache-relation-broken} | 0
 .../{cache-relation-changed => memcache-relation-changed} | 0
 ...cache-relation-departed => memcache-relation-departed} | 0
 hooks/{cache-relation-joined => memcache-relation-joined} | 0
 hooks/nova_cc_context.py                                  | 2 +-
 hooks/nova_cc_hooks.py                                    | 8 ++++----
 metadata.yaml                                             | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename hooks/{cache-relation-broken => memcache-relation-broken} (100%)
 rename hooks/{cache-relation-changed => memcache-relation-changed} (100%)
 rename hooks/{cache-relation-departed => memcache-relation-departed} (100%)
 rename hooks/{cache-relation-joined => memcache-relation-joined} (100%)

diff --git a/hooks/cache-relation-broken b/hooks/memcache-relation-broken
similarity index 100%
rename from hooks/cache-relation-broken
rename to hooks/memcache-relation-broken
diff --git a/hooks/cache-relation-changed b/hooks/memcache-relation-changed
similarity index 100%
rename from hooks/cache-relation-changed
rename to hooks/memcache-relation-changed
diff --git a/hooks/cache-relation-departed b/hooks/memcache-relation-departed
similarity index 100%
rename from hooks/cache-relation-departed
rename to hooks/memcache-relation-departed
diff --git a/hooks/cache-relation-joined b/hooks/memcache-relation-joined
similarity index 100%
rename from hooks/cache-relation-joined
rename to hooks/memcache-relation-joined
diff --git a/hooks/nova_cc_context.py b/hooks/nova_cc_context.py
index bbbcc88d..75c97e1b 100644
--- a/hooks/nova_cc_context.py
+++ b/hooks/nova_cc_context.py
@@ -290,7 +290,7 @@ class InstanceConsoleContext(context.OSContextGenerator):
         ctxt = {}
         servers = []
         try:
-            for rid in relation_ids('cache'):
+            for rid in relation_ids('memcache'):
                 for rel in relations_for_id(rid):
                     servers.append({'private-address': rel['private-address'],
                                     'port': rel['port']})
diff --git a/hooks/nova_cc_hooks.py b/hooks/nova_cc_hooks.py
index 5fe9eea7..cd6fa6f7 100755
--- a/hooks/nova_cc_hooks.py
+++ b/hooks/nova_cc_hooks.py
@@ -852,10 +852,10 @@ def neutron_api_relation_broken():
         quantum_joined(rid=rid)
 
 
-@hooks.hook('cache-relation-joined',
-            'cache-relation-departed',
-            'cache-relation-changed',
-            'cache-relation-broken')
+@hooks.hook('memcache-relation-joined',
+            'memcache-relation-departed',
+            'memcache-relation-changed',
+            'memcache-relation-broken')
 @restart_on_change(restart_map())
 def memcached_joined():
     CONFIGS.write(NOVA_CONF)
diff --git a/metadata.yaml b/metadata.yaml
index be2440de..f277b1cd 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -40,7 +40,7 @@ requires:
   nova-vmware:
     interface: nova-vmware
     scope: container
-  cache:
+  memcache:
     interface: memcache
 peers:
   cluster: