From a0cfc843f8fbe12a1add4920cd391c0825e35cc8 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Sun, 14 Jul 2013 09:40:07 +0000
Subject: [PATCH] Correct export Nova/Quantum metadata proxy shared secret

---
 manifests/nova/api.pp               | 8 ++++++--
 manifests/quantum/agent/metadata.pp | 9 +--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/manifests/nova/api.pp b/manifests/nova/api.pp
index e0c0a5d..45d6fa0 100644
--- a/manifests/nova/api.pp
+++ b/manifests/nova/api.pp
@@ -27,12 +27,16 @@ class kickstack::nova::api inherits kickstack {
     quantum_metadata_proxy_shared_secret => $secret
   }
 
-  # Export the metadata API IP address to be picked up
+  # Export the metadata API IP address and shared secret, to be picked up
   # by the Quantum metadata proxy agent on the network node
   kickstack::exportfact::export { "nova_metadata_ip":
     value => getvar("ipaddress_${nic_management}"),
     tag => "nova",
     require => Class['::nova::api']
   }
-
+  kickstack::exportfact::export { "quantum_metadata_shared_secret":
+    value => $secret,
+    tag => 'nova',
+    require => Class['::nova::api']
+  }
 }
diff --git a/manifests/quantum/agent/metadata.pp b/manifests/quantum/agent/metadata.pp
index 7098315..e95a99c 100644
--- a/manifests/quantum/agent/metadata.pp
+++ b/manifests/quantum/agent/metadata.pp
@@ -16,14 +16,7 @@ class kickstack::quantum::agent::metadata inherits kickstack {
     auth_user         => 'quantum',
     auth_url          => "http://${keystone_internal_address}:35357/v2.0", 
     auth_region       => "$kickstack::keystone_region",
-    metadata_ip       => $metadata_ip
-  }
-
-  # Export the registry host name string for the service
-  kickstack::exportfact::export { "quantum_metadata_shared_secret":
-    value => "${secret}",
-    tag => "quantum",
-    require => Class['::quantum::agents::metadata']
+    metadata_ip       => $metadata_ip,
   }
 
 }